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

texconv updated to handle non-pow2 volume textures with mips

Browse Source
This commit is contained in:
Chuck Walbourn 2018-04-18 00:08:35 -07:00
parent 9cde0a9ffa
commit 90a34e9959
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Texconv/texconv.cpp
View File

@ -2469,24 +2469,19 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
// --- Generate mips ----------------------------------------------------------- // --- Generate mips -----------------------------------------------------------
DWORD dwFilter3D = dwFilter;
if (!ispow2(info.width) || !ispow2(info.height) || !ispow2(info.depth)) if (!ispow2(info.width) || !ispow2(info.height) || !ispow2(info.depth))
{ {
if (info.dimension == TEX_DIMENSION_TEXTURE3D) if (!tMips || info.mipLevels != 1)
{
if (!tMips)
{
tMips = 1;
}
else
{
wprintf(L"\nERROR: Cannot generate mips for non-power-of-2 volume textures\n");
return 1;
}
}
else if (!tMips || info.mipLevels != 1)
{ {
nonpow2warn = true; nonpow2warn = true;
} }
if (info.dimension == TEX_DIMENSION_TEXTURE3D)
{
// Must force triangle filter for non-power-of-2 volume textures to get correct results
dwFilter3D = TEX_FILTER_TRIANGLE;
}
} }
if ((!tMips || info.mipLevels != tMips) && (info.mipLevels != 1)) if ((!tMips || info.mipLevels != tMips) && (info.mipLevels != 1))
@ -2590,7 +2585,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (info.dimension == TEX_DIMENSION_TEXTURE3D) if (info.dimension == TEX_DIMENSION_TEXTURE3D)
{ {
hr = GenerateMipMaps3D(image->GetImages(), image->GetImageCount(), image->GetMetadata(), dwFilter | dwFilterOpts, tMips, *timage); hr = GenerateMipMaps3D(image->GetImages(), image->GetImageCount(), image->GetMetadata(), dwFilter3D | dwFilterOpts, tMips, *timage);
} }
else else
{ {