MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix texture filter usage.

Browse Source
This commit is contained in:
Sergey Lipskiy 2014-12-25 16:18:35 +06:00
parent 3e81c5a835
commit 3b102d4ebd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Textures.cpp
View File

@ -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) {