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

Updated tools to use TGA_FLAGS parameter

Browse Source
This commit is contained in:
Chuck Walbourn 2020-09-30 12:37:49 -07:00
parent 836cabd0f9
commit b68c0df6d5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Texassemble/texassemble.cpp
View File

@ -651,7 +651,7 @@ namespace
return SaveToDDSFile(img, DDS_FLAGS_NONE, szOutputFile); return SaveToDDSFile(img, DDS_FLAGS_NONE, szOutputFile);
case CODEC_TGA: case CODEC_TGA:
return SaveToTGAFile(img, szOutputFile); return SaveToTGAFile(img, TGA_FLAGS_NONE, szOutputFile);
case CODEC_HDR: case CODEC_HDR:
return SaveToHDRFile(img, szOutputFile); return SaveToHDRFile(img, szOutputFile);
@ -1161,7 +1161,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
else if (_wcsicmp(ext, L".tga") == 0) else if (_wcsicmp(ext, L".tga") == 0)
{ {
hr = LoadFromTGAFile(pConv->szSrc, &info, *image); hr = LoadFromTGAFile(pConv->szSrc, TGA_FLAGS_NONE, &info, *image);
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L" FAILED (%x)\n", static_cast<unsigned int>(hr)); wprintf(L" FAILED (%x)\n", static_cast<unsigned int>(hr));

4
Texconv/texconv.cpp
View File

@ -1749,7 +1749,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
else if (_wcsicmp(ext, L".tga") == 0) else if (_wcsicmp(ext, L".tga") == 0)
{ {
hr = LoadFromTGAFile(pConv->szSrc, &info, *image); hr = LoadFromTGAFile(pConv->szSrc, TGA_FLAGS_NONE, &info, *image);
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L" FAILED (%x)\n", static_cast<unsigned int>(hr)); wprintf(L" FAILED (%x)\n", static_cast<unsigned int>(hr));
@ -3130,7 +3130,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
case CODEC_TGA: case CODEC_TGA:
hr = SaveToTGAFile(img[0], pConv->szDest, (dwOptions & (DWORD64(1) << OPT_TGA20)) ? &info : nullptr); hr = SaveToTGAFile(img[0], TGA_FLAGS_NONE, pConv->szDest, (dwOptions & (DWORD64(1) << OPT_TGA20)) ? &info : nullptr);
break; break;
case CODEC_HDR: case CODEC_HDR:

4
Texdiag/texdiag.cpp
View File

@ -651,7 +651,7 @@ namespace
} }
else if (_wcsicmp(ext, L".tga") == 0) else if (_wcsicmp(ext, L".tga") == 0)
{ {
return LoadFromTGAFile(fileName, &info, *image); return LoadFromTGAFile(fileName, TGA_FLAGS_NONE, &info, *image);
} }
else if (_wcsicmp(ext, L".hdr") == 0) else if (_wcsicmp(ext, L".hdr") == 0)
{ {
@ -685,7 +685,7 @@ namespace
return SaveToDDSFile(*image, DDS_FLAGS_NONE, fileName); return SaveToDDSFile(*image, DDS_FLAGS_NONE, fileName);
case CODEC_TGA: case CODEC_TGA:
return SaveToTGAFile(*image, fileName); return SaveToTGAFile(*image, TGA_FLAGS_NONE, fileName);
case CODEC_HDR: case CODEC_HDR:
return SaveToHDRFile(*image, fileName); return SaveToHDRFile(*image, fileName);