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

texconv: Fix for -nmap when outputing compressed UNORM formats

Browse Source
This commit is contained in:
Chuck Walbourn 2020-02-13 23:36:16 -08:00
parent 1c6f993963
commit 9d7c832874
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Texconv/texconv.cpp
View File

@ -2465,7 +2465,22 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
DXGI_FORMAT nmfmt = tformat; DXGI_FORMAT nmfmt = tformat;
if (IsCompressed(tformat)) if (IsCompressed(tformat))
{ {
nmfmt = (dwNormalMap & CNMAP_COMPUTE_OCCLUSION) ? DXGI_FORMAT_R32G32B32A32_FLOAT : DXGI_FORMAT_R32G32B32_FLOAT; switch (tformat)
{
case DXGI_FORMAT_BC4_SNORM:
case DXGI_FORMAT_BC5_SNORM:
nmfmt = DXGI_FORMAT_R8G8B8A8_SNORM;
break;
case DXGI_FORMAT_BC6H_SF16:
case DXGI_FORMAT_BC6H_UF16:
nmfmt = DXGI_FORMAT_R32G32B32_FLOAT;
break;
default:
nmfmt = DXGI_FORMAT_R8G8B8A8_UNORM;
break;
}
} }
hr = ComputeNormalMap(image->GetImages(), image->GetImageCount(), image->GetMetadata(), dwNormalMap, nmapAmplitude, nmfmt, *timage); hr = ComputeNormalMap(image->GetImages(), image->GetImageCount(), image->GetMetadata(), dwNormalMap, nmapAmplitude, nmfmt, *timage);