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

Fixed bug with non-square volume mipmaps

Browse Source
This commit is contained in:
walbourn_cp 2013-04-04 11:27:05 -07:00
parent 991b325f10
commit 91654fc9df
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -579,7 +579,7 @@ static HRESULT _Generate3DMipsPointFilter( _In_ size_t depth, _In_ size_t levels
size_t rowPitch = src->rowPitch; size_t rowPitch = src->rowPitch;
size_t nheight = height >> 1; size_t nheight = (height > 1) ? (height >> 1) : 1;
for( size_t y = 0; y < nheight; ++y ) for( size_t y = 0; y < nheight; ++y )
{ {
@ -587,7 +587,7 @@ static HRESULT _Generate3DMipsPointFilter( _In_ size_t depth, _In_ size_t levels
return E_FAIL; return E_FAIL;
pSrc += rowPitch*2; pSrc += rowPitch*2;
size_t nwidth = width >> 1; size_t nwidth = (width > 1) ? (width >> 1) : 1;
for( size_t x = 0; x < nwidth; ++x ) for( size_t x = 0; x < nwidth; ++x )
{ {
@ -614,7 +614,7 @@ static HRESULT _Generate3DMipsPointFilter( _In_ size_t depth, _In_ size_t levels
size_t rowPitch = src->rowPitch; size_t rowPitch = src->rowPitch;
size_t nheight = height >> 1; size_t nheight = (height > 1) ? (height >> 1) : 1;
for( size_t y = 0; y < nheight; ++y ) for( size_t y = 0; y < nheight; ++y )
{ {
@ -622,7 +622,7 @@ static HRESULT _Generate3DMipsPointFilter( _In_ size_t depth, _In_ size_t levels
return E_FAIL; return E_FAIL;
pSrc += rowPitch*2; pSrc += rowPitch*2;
size_t nwidth = width >> 1; size_t nwidth = (width > 1) ? (width >> 1) : 1;
for( size_t x = 0; x < nwidth; ++x ) for( size_t x = 0; x < nwidth; ++x )
{ {
@ -717,7 +717,7 @@ static HRESULT _Generate3DMipsBoxFilter( _In_ size_t depth, _In_ size_t levels,
size_t aRowPitch = srca->rowPitch; size_t aRowPitch = srca->rowPitch;
size_t bRowPitch = srcb->rowPitch; size_t bRowPitch = srcb->rowPitch;
size_t nheight = height >> 1; size_t nheight = (height > 1) ? (height >> 1) : 1;
for( size_t y = 0; y < nheight; ++y ) for( size_t y = 0; y < nheight; ++y )
{ {
@ -746,7 +746,7 @@ static HRESULT _Generate3DMipsBoxFilter( _In_ size_t depth, _In_ size_t levels,
pSrc2 += bRowPitch; pSrc2 += bRowPitch;
} }
size_t nwidth = width >> 1; size_t nwidth = (width > 1) ? (width >> 1) : 1;
for( size_t x = 0; x < nwidth; ++x ) for( size_t x = 0; x < nwidth; ++x )
{ {
@ -784,7 +784,7 @@ static HRESULT _Generate3DMipsBoxFilter( _In_ size_t depth, _In_ size_t levels,
size_t rowPitch = src->rowPitch; size_t rowPitch = src->rowPitch;
size_t nheight = height >> 1; size_t nheight = (height > 1) ? (height >> 1) : 1;
for( size_t y = 0; y < nheight; ++y ) for( size_t y = 0; y < nheight; ++y )
{ {
@ -799,7 +799,7 @@ static HRESULT _Generate3DMipsBoxFilter( _In_ size_t depth, _In_ size_t levels,
pSrc += rowPitch; pSrc += rowPitch;
} }
size_t nwidth = width >> 1; size_t nwidth = (width > 1) ? (width >> 1) : 1;
for( size_t x = 0; x < nwidth; ++x ) for( size_t x = 0; x < nwidth; ++x )
{ {