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

Fix for bug with XMStoreFloat3SE

Browse Source
This commit is contained in:
Chuck Walbourn 2016-07-07 17:50:21 -07:00
parent 6ca955fe26
commit 0f75b5d268
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
DirectXTex/DirectXTexConvert.cpp
View File

@ -151,6 +151,45 @@ namespace
return reinterpret_cast<float*>(&Result)[0]; return reinterpret_cast<float*>(&Result)[0];
} }
#if DIRECTX_MATH_VERSION >= 310
#define StoreFloat3SE XMStoreFloat3SE
#else
inline void XM_CALLCONV StoreFloat3SE(_Out_ XMFLOAT3SE* pDestination, DirectX::FXMVECTOR V)
{
assert(pDestination);
DirectX::XMFLOAT3A tmp;
DirectX::XMStoreFloat3A(&tmp, V);
static const float maxf9 = float(0x1FF << 7);
static const float minf9 = float(1.f / (1 << 16));
float x = (tmp.x >= 0.f) ? ((tmp.x > maxf9) ? maxf9 : tmp.x) : 0.f;
float y = (tmp.y >= 0.f) ? ((tmp.y > maxf9) ? maxf9 : tmp.y) : 0.f;
float z = (tmp.z >= 0.f) ? ((tmp.z > maxf9) ? maxf9 : tmp.z) : 0.f;
const float max_xy = (x > y) ? x : y;
const float max_xyz = (max_xy > z) ? max_xy : z;
const float maxColor = (max_xyz > minf9) ? max_xyz : minf9;
union { float f; int32_t i; } fi;
fi.f = maxColor;
fi.i += 0x00004000; // round up leaving 9 bits in fraction (including assumed 1)
// Fix applied from DirectXMath 3.10
uint32_t exp = fi.i >> 23;
pDestination->e = exp - 0x6f;
fi.i = 0x83000000 - (exp << 23);
float ScaleR = fi.f;
pDestination->xm = static_cast<uint32_t>( lroundf(x * ScaleR) );
pDestination->ym = static_cast<uint32_t>( lroundf(y * ScaleR) );
pDestination->zm = static_cast<uint32_t>( lroundf(z * ScaleR) );
}
#endif
}; };
namespace DirectX namespace DirectX
@ -1951,7 +1990,7 @@ bool _StoreScanline( LPVOID pDestination, size_t size, DXGI_FORMAT format,
return false; return false;
case DXGI_FORMAT_R9G9B9E5_SHAREDEXP: case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
STORE_SCANLINE( XMFLOAT3SE, XMStoreFloat3SE ) STORE_SCANLINE( XMFLOAT3SE, StoreFloat3SE )
case DXGI_FORMAT_R8G8_B8G8_UNORM: case DXGI_FORMAT_R8G8_B8G8_UNORM:
if ( size >= sizeof(XMUBYTEN4) ) if ( size >= sizeof(XMUBYTEN4) )