From 3b102d4ebd7619bf7e1aac4b23162f9c80b1863f Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Thu, 25 Dec 2014 16:18:35 +0600 Subject: [PATCH] Fix texture filter usage. --- Textures.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Textures.cpp b/Textures.cpp index 1caee615..8e9acfc1 100644 --- a/Textures.cpp +++ b/Textures.cpp @@ -795,7 +795,7 @@ void TextureCache::_loadBackground(CachedTexture *pTexture) glGetIntegerv(GL_UNPACK_ALIGNMENT, &curUnpackAlignment); bool bLoaded = false; - if (TFH.isInited() && config.textureFilter.txFilterIgnoreBG == 0) { + if ((config.textureFilter.txEnhancementMode | config.textureFilter.txFilterMode) != 0 && config.textureFilter.txFilterIgnoreBG == 0 && TFH.isInited()) { GHQTexInfo ghqTexInfo; if (txfilter_filter((u8*)pDest, pTexture->realWidth, pTexture->realHeight, glInternalFormat, (uint64)pTexture->crc, &ghqTexInfo) != 0 && ghqTexInfo.data != NULL) { if (ghqTexInfo.width % 2 != 0 && ghqTexInfo.format != GL_RGBA) @@ -816,7 +816,7 @@ void TextureCache::_loadBackground(CachedTexture *pTexture) bool TextureCache::_loadHiresTexture(u32 _tile, CachedTexture *_pTexture) { - if (!TFH.isInited()) + if (config.textureFilter.txHiresEnable == 0 || !TFH.isInited()) return false; isGLError(); // Workaround for Mupen64Plus; @@ -1010,7 +1010,7 @@ void TextureCache::_load(u32 _tile, CachedTexture *_pTexture) } bool bLoaded = false; - if (TFH.isInited() && maxLevel == 0 && (config.textureFilter.txFilterIgnoreBG == 0 || (RSP.cmd != G_TEXRECT && RSP.cmd != G_TEXRECTFLIP))) + if ((config.textureFilter.txEnhancementMode | config.textureFilter.txFilterMode) != 0 && maxLevel == 0 && (config.textureFilter.txFilterIgnoreBG == 0 || (RSP.cmd != G_TEXRECT && RSP.cmd != G_TEXRECTFLIP)) && TFH.isInited()) { GHQTexInfo ghqTexInfo; if (txfilter_filter((u8*)pDest, tmptex.realWidth, tmptex.realHeight, glInternalFormat, (uint64)_pTexture->crc, &ghqTexInfo) != 0 && ghqTexInfo.data != NULL) {