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

texconv -reconstructz updated to handle UNORM properly

Browse Source
This commit is contained in:
Chuck Walbourn 2021-02-24 00:20:48 -08:00
parent 87e5b0e9fa
commit 610bbbd84e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Texconv/texconv.cpp
View File

@ -2792,6 +2792,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1; return 1;
} }
bool isunorm = (FormatDataType(info.format) == FORMAT_TYPE_UNORM) != 0;
hr = TransformImage(image->GetImages(), image->GetImageCount(), image->GetMetadata(), hr = TransformImage(image->GetImages(), image->GetImageCount(), image->GetMetadata(),
[&](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t w, size_t y) [&](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t w, size_t y)
{ {
@ -2803,7 +2805,17 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
{ {
XMVECTOR value = inPixels[j]; XMVECTOR value = inPixels[j];
XMVECTOR z = XMVectorSqrt(XMVectorSubtract(g_XMOne, XMVector2Dot(value, value))); XMVECTOR z;
if (isunorm)
{
XMVECTOR x2 = XMVectorMultiplyAdd(value, g_XMTwo, g_XMNegativeOne);
x2 = XMVectorSqrt(XMVectorSubtract(g_XMOne, XMVector2Dot(x2, x2)));
z = XMVectorMultiplyAdd(x2, g_XMOneHalf, g_XMOneHalf);
}
else
{
z = XMVectorSqrt(XMVectorSubtract(g_XMOne, XMVector2Dot(value, value)));
}
outPixels[j] = XMVectorSelect(value, z, s_selectz); outPixels[j] = XMVectorSelect(value, z, s_selectz);
} }