mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
DX11: Fix some corruption caused by passing the wrong pitch to UpdateSubresource.
Fix calculation of miplevels in TextureCache::Load. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5708 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -172,7 +172,7 @@ void TextureCache::Cleanup()
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Verify that this actually returns the value needed below
|
||||
// returns the exponent of the smallest power of two which is greater than val
|
||||
unsigned int GetPow2(unsigned int val)
|
||||
{
|
||||
unsigned int ret = 0;
|
||||
@ -250,7 +250,7 @@ TextureCache::TCacheEntry* TextureCache::Load(unsigned int stage, u32 address, u
|
||||
entry.isRenderTarget = false;
|
||||
bool isPow2 = !((width & (width - 1)) || (height & (height - 1)));
|
||||
entry.isNonPow2 = false;
|
||||
unsigned int TexLevels = (isPow2 && UseNativeMips && maxlevel) ? (GetPow2(max(width, height)) + 1) : ((isPow2)? 0 : 1);
|
||||
unsigned int TexLevels = (isPow2 && UseNativeMips && maxlevel) ? GetPow2(max(width, height)) : ((isPow2)? 0 : 1);
|
||||
if (TexLevels > (maxlevel + 1) && maxlevel)
|
||||
TexLevels = maxlevel + 1;
|
||||
entry.MipLevels = maxlevel;
|
||||
|
Reference in New Issue
Block a user