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

DirectXTex: Added TEX_FILTER_BOX (which is an alias for FANT)

Browse Source
This commit is contained in:
walbourn_cp 2013-06-03 15:32:00 -07:00
parent f6cace44e8
commit add7763d9c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DirectXTex/DirectXTex.h
View File

@ -389,6 +389,7 @@ namespace DirectX
TEX_FILTER_POINT = 0x100000, TEX_FILTER_POINT = 0x100000,
TEX_FILTER_LINEAR = 0x200000, TEX_FILTER_LINEAR = 0x200000,
TEX_FILTER_CUBIC = 0x300000, TEX_FILTER_CUBIC = 0x300000,
TEX_FILTER_BOX = 0x400000,
TEX_FILTER_FANT = 0x400000, // Equiv to Box filtering for mipmap generation TEX_FILTER_FANT = 0x400000, // Equiv to Box filtering for mipmap generation
// Filtering mode to use for any required image resizing // Filtering mode to use for any required image resizing

8
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -866,6 +866,8 @@ HRESULT GenerateMipMaps( const Image& baseImage, DWORD filter, size_t levels, Sc
case TEX_FILTER_LINEAR: case TEX_FILTER_LINEAR:
case TEX_FILTER_CUBIC: case TEX_FILTER_CUBIC:
{ {
static_assert( TEX_FILTER_FANT == TEX_FILTER_BOX, "TEX_FILTER_ flags alias mismatch" );
WICPixelFormatGUID pfGUID; WICPixelFormatGUID pfGUID;
if ( _DXGIToWIC( baseImage.format, pfGUID, true ) ) 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_LINEAR:
case TEX_FILTER_CUBIC: case TEX_FILTER_CUBIC:
{ {
static_assert( TEX_FILTER_FANT == TEX_FILTER_BOX, "TEX_FILTER_ flags alias mismatch" );
WICPixelFormatGUID pfGUID; WICPixelFormatGUID pfGUID;
if ( _DXGIToWIC( metadata.format, pfGUID, true ) ) 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 ) switch( filter & TEX_FILTER_MASK )
{ {
case 0: case 0:
case TEX_FILTER_FANT: case TEX_FILTER_BOX:
hr = _Setup3DMips( baseImages, depth, levels, mipChain ); hr = _Setup3DMips( baseImages, depth, levels, mipChain );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
@ -1129,7 +1133,7 @@ HRESULT GenerateMipMaps3D( const Image* srcImages, size_t nimages, const TexMeta
switch( filter & TEX_FILTER_MASK ) switch( filter & TEX_FILTER_MASK )
{ {
case 0: case 0:
case TEX_FILTER_FANT: case TEX_FILTER_BOX:
hr = _Setup3DMips( &baseImages[0], metadata.depth, levels, mipChain ); hr = _Setup3DMips( &baseImages[0], metadata.depth, levels, mipChain );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;