diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 58a3bdf..ca91912 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -389,6 +389,7 @@ namespace DirectX TEX_FILTER_POINT = 0x100000, TEX_FILTER_LINEAR = 0x200000, TEX_FILTER_CUBIC = 0x300000, + TEX_FILTER_BOX = 0x400000, TEX_FILTER_FANT = 0x400000, // Equiv to Box filtering for mipmap generation // Filtering mode to use for any required image resizing diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp index 9a7549a..19a7798 100644 --- a/DirectXTex/DirectXTexMipmaps.cpp +++ b/DirectXTex/DirectXTexMipmaps.cpp @@ -866,6 +866,8 @@ HRESULT GenerateMipMaps( const Image& baseImage, DWORD filter, size_t levels, Sc case TEX_FILTER_LINEAR: case TEX_FILTER_CUBIC: { + static_assert( TEX_FILTER_FANT == TEX_FILTER_BOX, "TEX_FILTER_ flags alias mismatch" ); + WICPixelFormatGUID pfGUID; if ( _DXGIToWIC( baseImage.format, pfGUID, true ) ) { @@ -931,6 +933,8 @@ HRESULT GenerateMipMaps( const Image* srcImages, size_t nimages, const TexMetada case TEX_FILTER_LINEAR: case TEX_FILTER_CUBIC: { + static_assert( TEX_FILTER_FANT == TEX_FILTER_BOX, "TEX_FILTER_ flags alias mismatch" ); + WICPixelFormatGUID pfGUID; if ( _DXGIToWIC( metadata.format, pfGUID, true ) ) { @@ -1051,7 +1055,7 @@ HRESULT GenerateMipMaps3D( const Image* baseImages, size_t depth, DWORD filter, switch( filter & TEX_FILTER_MASK ) { case 0: - case TEX_FILTER_FANT: + case TEX_FILTER_BOX: hr = _Setup3DMips( baseImages, depth, levels, mipChain ); if ( FAILED(hr) ) return hr; @@ -1129,7 +1133,7 @@ HRESULT GenerateMipMaps3D( const Image* srcImages, size_t nimages, const TexMeta switch( filter & TEX_FILTER_MASK ) { case 0: - case TEX_FILTER_FANT: + case TEX_FILTER_BOX: hr = _Setup3DMips( &baseImages[0], metadata.depth, levels, mipChain ); if ( FAILED(hr) ) return hr;