diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp index 1659247a..56be0719 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp @@ -515,8 +515,6 @@ public: void update(bool _force) override { int textureFilter = gDP.otherMode.textureFilter; - if ((gSP.objRendermode&G_OBJRM_BILERP) != 0) - textureFilter |= 2; uTextureFilterMode.set(textureFilter, _force); uTextureFormat.set(gSP.textureTile[0]->format, gSP.textureTile[1]->format, _force); uTextureConvert.set(gDP.otherMode.convert_one, _force); diff --git a/src/GraphicsDrawer.cpp b/src/GraphicsDrawer.cpp index b7937c49..6f1fb8cb 100644 --- a/src/GraphicsDrawer.cpp +++ b/src/GraphicsDrawer.cpp @@ -1158,7 +1158,7 @@ void GraphicsDrawer::drawTexturedRect(const TexturedRectParams & _params) const FrameBuffer * pCurrentBuffer = _params.pBuffer; DisplayWindow & wnd = dwnd(); TextureCache & cache = textureCache(); - const bool bUseBilinear = (gDP.otherMode.textureFilter | (gSP.objRendermode&G_OBJRM_BILERP)) != 0; + const bool bUseBilinear = gDP.otherMode.textureFilter != 0; const bool bUseTexrectDrawer = config.generalEmulation.enableNativeResTexrects != 0 && bUseBilinear && pCurrentCombiner->usesTexture() diff --git a/src/Textures.cpp b/src/Textures.cpp index cfdbf013..d333193b 100644 --- a/src/Textures.cpp +++ b/src/Textures.cpp @@ -1302,7 +1302,7 @@ void TextureCache::activateTexture(u32 _t, CachedTexture *_pTexture) params.target = textureTarget::TEXTURE_2D; params.textureUnitIndex = textureIndices::Tex[_t]; - const bool bUseBilinear = (gDP.otherMode.textureFilter | (gSP.objRendermode&G_OBJRM_BILERP)) != 0; + const bool bUseBilinear = gDP.otherMode.textureFilter != 0; const bool bUseLOD = currentCombiner()->usesLOD(); const s32 texLevel = bUseLOD ? _pTexture->max_level : 0; params.maxMipmapLevel = Parameter(texLevel);