diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp index 8d904c41..24466abe 100644 --- a/src/FrameBuffer.cpp +++ b/src/FrameBuffer.cpp @@ -1679,7 +1679,7 @@ void RDRAMtoFrameBuffer::CopyFromRDRAM( u32 _address, bool _bUseAlpha) CombinerInfo::get().setCombine(EncodeCombineMode(0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1)); glDisable(GL_BLEND); } - currentCombiner()->updateFBInfo(); + currentCombiner()->updateFrameBufferInfo(); glDisable(GL_DEPTH_TEST); const u32 gdpChanged = gDP.changed & CHANGED_CPU_FB_WRITE; diff --git a/src/GLES2/GLSLCombiner_gles2.cpp b/src/GLES2/GLSLCombiner_gles2.cpp index 150c027d..4b42acba 100644 --- a/src/GLES2/GLSLCombiner_gles2.cpp +++ b/src/GLES2/GLSLCombiner_gles2.cpp @@ -295,7 +295,7 @@ void ShaderCombiner::update(bool _bForce) { m_uniforms.uTex0.set(0, true); m_uniforms.uTex1.set(1, true); } - updateFBInfo(true); + updateFrameBufferInfo(true); updateRenderState(true); } @@ -421,7 +421,7 @@ void ShaderCombiner::updateTextureInfo(bool _bForce) { m_uniforms.uTextureFilterMode.set(gDP.otherMode.textureFilter | (gSP.objRendermode&G_OBJRM_BILERP), _bForce); } -void ShaderCombiner::updateFBInfo(bool _bForce) { +void ShaderCombiner::updateFrameBufferInfo(bool _bForce) { if (!usesTexture()) return; diff --git a/src/GLSLCombiner.h b/src/GLSLCombiner.h index ea9dae68..9a27c508 100644 --- a/src/GLSLCombiner.h +++ b/src/GLSLCombiner.h @@ -16,7 +16,7 @@ public: void updateFogMode(bool _bForce = false); void updateDitherMode(bool _bForce = false); void updateLOD(bool _bForce = false); - void updateFBInfo(bool _bForce = false); + void updateFrameBufferInfo(bool _bForce = false); void updateDepthInfo(bool _bForce = false); void updateAlphaTestInfo(bool _bForce = false); void updateTextureInfo(bool _bForce = false); diff --git a/src/OGL3X/GLSLCombiner_ogl3x.cpp b/src/OGL3X/GLSLCombiner_ogl3x.cpp index 15a54289..d420c14f 100644 --- a/src/OGL3X/GLSLCombiner_ogl3x.cpp +++ b/src/OGL3X/GLSLCombiner_ogl3x.cpp @@ -508,7 +508,7 @@ void ShaderCombiner::update(bool _bForce) { #endif } - updateFBInfo(true); + updateFrameBufferInfo(true); updateRenderState(true); } @@ -647,7 +647,7 @@ void ShaderCombiner::updateTextureInfo(bool _bForce) { m_uniforms.uTextureFilterMode.set(gDP.otherMode.textureFilter | (gSP.objRendermode&G_OBJRM_BILERP), _bForce); } -void ShaderCombiner::updateFBInfo(bool _bForce) { +void ShaderCombiner::updateFrameBufferInfo(bool _bForce) { if (!usesTexture()) return; diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp index 7746a1ca..5b85633e 100644 --- a/src/OpenGL.cpp +++ b/src/OpenGL.cpp @@ -655,7 +655,7 @@ void OGLRender::_updateStates(RENDER_STATE _renderState) const else textureCache().activateDummy(t); } - pCurrentCombiner->updateFBInfo(); + pCurrentCombiner->updateFrameBufferInfo(); } if (_renderState == rsTriangle || _renderState == rsLine) cmbInfo.updateTextureParameters();