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

DirectXTex: BC6H / BC 7 handling of invalid mode blocks updated to match the format specs

Browse Source
This commit is contained in:
walbourn_cp 2013-07-10 10:49:59 -07:00
parent 51af8e4af5
commit b610af415e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DirectXTex/BC6HBC7.cpp
View File

@ -1240,9 +1240,21 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const
else
{
#ifdef _DEBUG
OutputDebugStringA( "BC6H: Invalid mode encountered during decoding\n" );
const char* warnstr = "BC6H: Invalid mode encountered during decoding\n";
switch( uMode )
{
case 0x13: warnstr = "BC6H: Reserved mode 10011 encountered during decoding\n"; break;
case 0x17: warnstr = "BC6H: Reserved mode 10111 encountered during decoding\n"; break;
case 0x1B: warnstr = "BC6H: Reserved mode 11011 encountered during decoding\n"; break;
case 0x1F: warnstr = "BC6H: Reserved mode 11111 encountered during decoding\n"; break;
}
OutputDebugStringA( warnstr );
#endif
FillWithErrorColors( pOut );
// Per the BC6H format spec, we must return opaque black
for(size_t i = 0; i < NUM_PIXELS_PER_BLOCK; ++i)
{
pOut[i] = HDRColorA(0.0f, 0.0f, 0.0f, 1.0f);
}
}
}
@ -2138,9 +2150,10 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const
else
{
#ifdef _DEBUG
OutputDebugStringA( "BC7: Invalid mode encountered during decoding\n" );
OutputDebugStringA( "BC7: Reserved mode 8 encountered during decoding\n" );
#endif
FillWithErrorColors( pOut );
// Per the BC7 format spec, we must return transparent black
memset( pOut, 0, sizeof(HDRColorA) * NUM_PIXELS_PER_BLOCK );
}
}