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 bug in CPU BC6H compressor if none of the pixel values fall into the SDR 0-1 range

Browse Source
This commit is contained in:
Chuck Walbourn 2022-03-13 14:52:34 -07:00
parent 9b01346eeb
commit 4482cb3e40
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DirectXTex/BC6HBC7.cpp
View File

@ -1180,6 +1180,7 @@ namespace
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
template<bool ishdr>
float OptimizeRGB( float OptimizeRGB(
_In_reads_(NUM_PIXELS_PER_BLOCK) const HDRColorA* const pPoints, _In_reads_(NUM_PIXELS_PER_BLOCK) const HDRColorA* const pPoints,
_Out_ HDRColorA* pX, _Out_ HDRColorA* pX,
@ -1193,8 +1194,17 @@ namespace
const float *pD = (3 == cSteps) ? pD3 : pD4; const float *pD = (3 == cSteps) ? pD3 : pD4;
// Find Min and Max points, as starting point // Find Min and Max points, as starting point
HDRColorA X(1.0f, 1.0f, 1.0f, 0.0f); HDRColorA X, Y;
HDRColorA Y(0.0f, 0.0f, 0.0f, 0.0f); if (ishdr)
{
X = HDRColorA{ FLT_MAX, FLT_MAX, FLT_MAX, 0.0f };
Y = HDRColorA{ -FLT_MAX, -FLT_MAX, -FLT_MAX, 0.0f };
}
else
{
X = HDRColorA{ 1.0f, 1.0f, 1.0f, 0.0f };
Y = HDRColorA{ 0.0f, 0.0f, 0.0f, 0.0f };
}
for (size_t iPoint = 0; iPoint < cPixels; iPoint++) for (size_t iPoint = 0; iPoint < cPixels; iPoint++)
{ {
@ -2492,7 +2502,7 @@ float D3DX_BC6H::RoughMSE(EncodeParams* pEP) const noexcept
} }
HDRColorA epA, epB; HDRColorA epA, epB;
OptimizeRGB(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx); OptimizeRGB<true>(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
aEndPts[p].A.Set(epA, pEP->bSigned); aEndPts[p].A.Set(epA, pEP->bSigned);
aEndPts[p].B.Set(epB, pEP->bSigned); aEndPts[p].B.Set(epB, pEP->bSigned);
if (pEP->bSigned) if (pEP->bSigned)
@ -3464,7 +3474,7 @@ float D3DX_BC7::RoughMSE(EncodeParams* pEP, size_t uShape, size_t uIndexMode) no
} }
HDRColorA epA, epB; HDRColorA epA, epB;
OptimizeRGB(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx); OptimizeRGB<false>(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
epA.Clamp(0.0f, 1.0f); epA.Clamp(0.0f, 1.0f);
epB.Clamp(0.0f, 1.0f); epB.Clamp(0.0f, 1.0f);
epA *= 255.0f; epA *= 255.0f;