diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-11-21 19:12:58 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-11-21 19:12:58 +1300 |
| commit | 4ef0ab273167adf6e568ec602143f7cd0c04edae (patch) | |
| tree | 5eb180ed240b2f565f488fb6ba4ff4f10d3aaf6a /Source/Core/VideoCommon/TextureCacheBase.cpp | |
| parent | 21e4e035cc468760c55b3dccc6d0fc1000f69c9f (diff) | |
| parent | 733795891cad7894a9d51e23d125157fccd9e5a0 (diff) | |
Merge pull request #1534 from FioraAeterna/fixd3dtex1x1
D3D: fix issues with multi-level 1x1 textures on D3D
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index df28184615..0618b3f1b9 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -410,7 +410,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, // D3D doesn't like when the specified mipmap count would require more than one 1x1-sized LOD in the mipmap chain // e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,1x1, so we limit the mipmap count to 6 there - while (g_ActiveConfig.backend_info.bUseMinimalMipCount && std::max(expandedWidth, expandedHeight) >> maxlevel == 0) + while (g_ActiveConfig.backend_info.bUseMinimalMipCount && std::max(width, height) >> maxlevel == 0) --maxlevel; TCacheEntryBase *entry = textures[texID]; |