Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert command-line tools to use GNU-style long options #541

Merged
merged 18 commits into from
Oct 28, 2024
Merged

Convert command-line tools to use GNU-style long options #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9cb80ba
Convert texconv to use GNU-style long options
walbourn Oct 24, 2024
4e1b1a3
Fix -- usage
walbourn Oct 24, 2024
26b96ae
Keep -tga20
walbourn Oct 24, 2024
1b0a82b
Add hints for changes to GNU-style
walbourn Oct 24, 2024
be46790
Remove redundant hints
walbourn Oct 24, 2024
0047cf1
Code review
walbourn Oct 24, 2024
3f2d7fd
keep all existing switches to avoid breaking changes
walbourn Oct 26, 2024
45cf94a
Convert texassemble to use GNU-style long options
walbourn Oct 26, 2024
98c9b73
texdiag fixes for dumpdds
walbourn Oct 26, 2024
a050b63
Convert texdiag to use GNU-style long options
walbourn Oct 26, 2024
28bfdbb
Change some use of #define to constexpr
walbourn Oct 26, 2024
af8ae93
Minor code review
walbourn Oct 26, 2024
619453e
More code review
walbourn Oct 26, 2024
4f6458d
reclaim flags bits from options that need them
walbourn Oct 26, 2024
4cecb73
reclaim flags bits from options that need them
walbourn Oct 26, 2024
3ca3a7d
reclaim flags bits from options that need them
walbourn Oct 26, 2024
415563b
Code review
walbourn Oct 26, 2024
8478e6d
Code review for cstdint constants
walbourn Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DirectXTex/DirectXTex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace DirectX

size_t __cdecl BytesPerBlock(_In_ DXGI_FORMAT fmt) noexcept;

enum FORMAT_TYPE
enum FORMAT_TYPE : uint32_t
{
FORMAT_TYPE_TYPELESS,
FORMAT_TYPE_FLOAT,
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace DirectX

//---------------------------------------------------------------------------------
// Texture metadata
enum TEX_DIMENSION
enum TEX_DIMENSION : uint32_t
// Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
{
TEX_DIMENSION_TEXTURE1D = 2,
Expand All @@ -155,7 +155,7 @@ namespace DirectX
TEX_MISC2_ALPHA_MODE_MASK = 0x7L,
};

enum TEX_ALPHA_MODE
enum TEX_ALPHA_MODE : uint32_t
// Matches DDS_ALPHA_MODE, encoded in MISC_FLAGS2
{
TEX_ALPHA_MODE_UNKNOWN = 0,
Expand Down Expand Up @@ -934,7 +934,7 @@ namespace DirectX
//---------------------------------------------------------------------------------
// WIC utility code
#ifdef _WIN32
enum WICCodecs
enum WICCodecs : uint32_t
{
WIC_CODEC_BMP = 1, // Windows Bitmap (.bmp)
WIC_CODEC_JPEG, // Joint Photographic Experts Group (.jpg, .jpeg)
Expand Down
Loading
Loading