Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-13 13:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

texassemble/texconv/texdiag: added -l switch

Browse Source
This commit is contained in:
Chuck Walbourn 2020-04-13 17:22:55 -07:00
parent c0481b1030
commit e169033b60
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Texassemble/texassemble.cpp
View File

@ -78,6 +78,7 @@ enum OPTIONS
OPT_SRGBO, OPT_SRGBO,
OPT_SRGB, OPT_SRGB,
OPT_OUTPUTFILE, OPT_OUTPUTFILE,
OPT_TOLOWER,
OPT_OVERWRITE, OPT_OVERWRITE,
OPT_USE_DX10, OPT_USE_DX10,
OPT_NOLOGO, OPT_NOLOGO,
@ -136,6 +137,7 @@ const SValue g_pOptions[] =
{ L"srgbo", OPT_SRGBO }, { L"srgbo", OPT_SRGBO },
{ L"srgb", OPT_SRGB }, { L"srgb", OPT_SRGB },
{ L"o", OPT_OUTPUTFILE }, { L"o", OPT_OUTPUTFILE },
{ L"l", OPT_TOLOWER },
{ L"y", OPT_OVERWRITE }, { L"y", OPT_OVERWRITE },
{ L"dx10", OPT_USE_DX10 }, { L"dx10", OPT_USE_DX10 },
{ L"nologo", OPT_NOLOGO }, { L"nologo", OPT_NOLOGO },
@ -519,6 +521,7 @@ namespace
wprintf(L" -if <filter> image filtering\n"); wprintf(L" -if <filter> image filtering\n");
wprintf(L" -srgb{i|o} sRGB {input, output}\n"); wprintf(L" -srgb{i|o} sRGB {input, output}\n");
wprintf(L" -o <filename> output filename\n"); wprintf(L" -o <filename> output filename\n");
wprintf(L" -l force output filename to lower case\n");
wprintf(L" -y overwrite existing output file (if any)\n"); wprintf(L" -y overwrite existing output file (if any)\n");
wprintf(L" -sepalpha resize alpha channel separately from color channels\n"); wprintf(L" -sepalpha resize alpha channel separately from color channels\n");
wprintf(L" -nowic Force non-WIC filtering\n"); wprintf(L" -nowic Force non-WIC filtering\n");
@ -1885,6 +1888,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wprintf(L"\n"); wprintf(L"\n");
fflush(stdout); fflush(stdout);
if (dwOptions & (1 << OPT_TOLOWER))
{
(void)_wcslwr_s(szOutputFile);
}
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES)
@ -1967,6 +1975,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wprintf(L"\n"); wprintf(L"\n");
fflush(stdout); fflush(stdout);
if (dwOptions & (1 << OPT_TOLOWER))
{
(void)_wcslwr_s(szOutputFile);
}
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES)
@ -2033,6 +2046,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wprintf(L"\n"); wprintf(L"\n");
fflush(stdout); fflush(stdout);
if (dwOptions & (1 << OPT_TOLOWER))
{
(void)_wcslwr_s(szOutputFile);
}
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES)
@ -2100,6 +2118,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wprintf(L"\n"); wprintf(L"\n");
fflush(stdout); fflush(stdout);
if (dwOptions & (1 << OPT_TOLOWER))
{
(void)_wcslwr_s(szOutputFile);
}
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES)

8
Texconv/texconv.cpp
View File

@ -68,6 +68,7 @@ enum OPTIONS
OPT_PREFIX, OPT_PREFIX,
OPT_SUFFIX, OPT_SUFFIX,
OPT_OUTPUTDIR, OPT_OUTPUTDIR,
OPT_TOLOWER,
OPT_OVERWRITE, OPT_OVERWRITE,
OPT_FILETYPE, OPT_FILETYPE,
OPT_HFLIP, OPT_HFLIP,
@ -157,6 +158,7 @@ const SValue g_pOptions[] =
{ L"px", OPT_PREFIX }, { L"px", OPT_PREFIX },
{ L"sx", OPT_SUFFIX }, { L"sx", OPT_SUFFIX },
{ L"o", OPT_OUTPUTDIR }, { L"o", OPT_OUTPUTDIR },
{ L"l", OPT_TOLOWER },
{ L"y", OPT_OVERWRITE }, { L"y", OPT_OVERWRITE },
{ L"ft", OPT_FILETYPE }, { L"ft", OPT_FILETYPE },
{ L"hflip", OPT_HFLIP }, { L"hflip", OPT_HFLIP },
@ -720,6 +722,7 @@ namespace
wprintf(L"\n -px <string> name prefix\n"); wprintf(L"\n -px <string> name prefix\n");
wprintf(L" -sx <string> name suffix\n"); wprintf(L" -sx <string> name suffix\n");
wprintf(L" -o <directory> output directory\n"); wprintf(L" -o <directory> output directory\n");
wprintf(L" -l force output filename to lower case\n");
wprintf(L" -y overwrite existing output file (if any)\n"); wprintf(L" -y overwrite existing output file (if any)\n");
wprintf(L" -ft <filetype> output file type\n"); wprintf(L" -ft <filetype> output file type\n");
wprintf(L"\n -hflip horizonal flip of source image\n"); wprintf(L"\n -hflip horizonal flip of source image\n");
@ -3066,6 +3069,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wcscat_s(pConv->szDest, MAX_PATH, szSuffix); wcscat_s(pConv->szDest, MAX_PATH, szSuffix);
if (dwOptions & (DWORD64(1) << OPT_TOLOWER))
{
(void)_wcslwr_s(pConv->szDest);
}
// Write texture // Write texture
wprintf(L"writing %ls", pConv->szDest); wprintf(L"writing %ls", pConv->szDest);
fflush(stdout); fflush(stdout);

8
Texdiag/texdiag.cpp
View File

@ -64,6 +64,7 @@ enum OPTIONS
OPT_DDS_DWORD_ALIGN, OPT_DDS_DWORD_ALIGN,
OPT_DDS_BAD_DXTN_TAILS, OPT_DDS_BAD_DXTN_TAILS,
OPT_OUTPUTFILE, OPT_OUTPUTFILE,
OPT_TOLOWER,
OPT_OVERWRITE, OPT_OVERWRITE,
OPT_FILETYPE, OPT_FILETYPE,
OPT_NOLOGO, OPT_NOLOGO,
@ -113,6 +114,7 @@ const SValue g_pOptions[] =
{ L"badtails", OPT_DDS_BAD_DXTN_TAILS }, { L"badtails", OPT_DDS_BAD_DXTN_TAILS },
{ L"nologo", OPT_NOLOGO }, { L"nologo", OPT_NOLOGO },
{ L"o", OPT_OUTPUTFILE }, { L"o", OPT_OUTPUTFILE },
{ L"l", OPT_TOLOWER },
{ L"y", OPT_OVERWRITE }, { L"y", OPT_OVERWRITE },
{ L"ft", OPT_FILETYPE }, { L"ft", OPT_FILETYPE },
{ L"tu", OPT_TYPELESS_UNORM }, { L"tu", OPT_TYPELESS_UNORM },
@ -549,6 +551,7 @@ namespace
wprintf(L"\n (diff only)\n"); wprintf(L"\n (diff only)\n");
wprintf(L" -f <format> format\n"); wprintf(L" -f <format> format\n");
wprintf(L" -o <filename> output filename\n"); wprintf(L" -o <filename> output filename\n");
wprintf(L" -l force output filename to lower case\n");
wprintf(L" -y overwrite existing output file (if any)\n"); wprintf(L" -y overwrite existing output file (if any)\n");
wprintf(L"\n (dumpbc only)\n"); wprintf(L"\n (dumpbc only)\n");
wprintf(L" -targetx <num> dump pixels at location x (defaults to all)\n"); wprintf(L" -targetx <num> dump pixels at location x (defaults to all)\n");
@ -3368,6 +3371,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1; return 1;
} }
if (dwOptions & (1 << OPT_TOLOWER))
{
(void)_wcslwr_s(szOutputFile);
}
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES)