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

Fixed problem loading DDS files that use FOURCC but have extra irrelevant bits set

Browse Source
This commit is contained in:
Chuck Walbourn 2018-08-17 17:31:23 -07:00
parent 908869c96e
commit 43969ca15f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DirectXTex/DirectXTexDDS.cpp
View File

@ -166,14 +166,15 @@ namespace
{ {
const LegacyDDS* entry = &g_LegacyDDSMap[index]; const LegacyDDS* entry = &g_LegacyDDSMap[index];
if (ddpfFlags == entry->ddpf.flags) if ((ddpfFlags & DDS_FOURCC) && (entry->ddpf.flags & DDS_FOURCC))
{ {
if (entry->ddpf.flags & DDS_FOURCC) // In case of FourCC codes, ignore any other bits in ddpf.flags
{ if (ddpf.fourCC == entry->ddpf.fourCC)
if (ddpf.fourCC == entry->ddpf.fourCC) break;
break; }
} else if (ddpfFlags == entry->ddpf.flags)
else if (entry->ddpf.flags & DDS_PAL8) {
if (entry->ddpf.flags & DDS_PAL8)
{ {
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount) if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount)
break; break;