Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

texconv/diag/assemble updated with format name aliases like DXT3 and FP16

Browse Source
This commit is contained in:
Chuck Walbourn
2018-02-22 00:17:49 -08:00
parent dce34a8b2b
commit 2b2f90259a
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Texassemble/texassemble.cpp
View File

@@ -220,6 +220,14 @@ const SValue g_pFormats [] =
{ nullptr, DXGI_FORMAT_UNKNOWN }
};
const SValue g_pFormatAliases [] =
{
{ L"FP16", DXGI_FORMAT_R16G16B16A16_FLOAT },
{ L"FP32", DXGI_FORMAT_R32G32B32A32_FLOAT },
{ nullptr, DXGI_FORMAT_UNKNOWN }
};
const SValue g_pFilters [] =
{
{ L"POINT", TEX_FILTER_POINT },
@@ -518,6 +526,8 @@ namespace
wprintf(L"\n <format>: ");
PrintList(13, g_pFormats);
wprintf(L" ");
PrintList(13, g_pFormatAliases);
wprintf(L"\n <filter>: ");
PrintList(13, g_pFilters);
@@ -1016,11 +1026,15 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
break;
case OPT_FORMAT:
format = (DXGI_FORMAT)LookupByName(pValue, g_pFormats);
format = static_cast<DXGI_FORMAT>(LookupByName(pValue, g_pFormats));
if (!format)
{
wprintf(L"Invalid value specified with -f (%ls)\n", pValue);
return 1;
format = static_cast<DXGI_FORMAT>(LookupByName(pValue, g_pFormatAliases));
if (!format)
{
wprintf(L"Invalid value specified with -f (%ls)\n", pValue);
return 1;
}
}
break;