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

Rename ShaderCombiner::updateFBInfo to ShaderCombiner::updateFrameBufferInfo

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-01-17 15:13:17 +06:00
parent 32dd944cf3
commit 1ec14d0f8b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/FrameBuffer.cpp
View File

@ -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)); CombinerInfo::get().setCombine(EncodeCombineMode(0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1));
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
currentCombiner()->updateFBInfo(); currentCombiner()->updateFrameBufferInfo();
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
const u32 gdpChanged = gDP.changed & CHANGED_CPU_FB_WRITE; const u32 gdpChanged = gDP.changed & CHANGED_CPU_FB_WRITE;

4
src/GLES2/GLSLCombiner_gles2.cpp
View File

@ -295,7 +295,7 @@ void ShaderCombiner::update(bool _bForce) {
m_uniforms.uTex0.set(0, true); m_uniforms.uTex0.set(0, true);
m_uniforms.uTex1.set(1, true); m_uniforms.uTex1.set(1, true);
} }
updateFBInfo(true); updateFrameBufferInfo(true);
updateRenderState(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); 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()) if (!usesTexture())
return; return;

2
src/GLSLCombiner.h
View File

@ -16,7 +16,7 @@ public:
void updateFogMode(bool _bForce = false); void updateFogMode(bool _bForce = false);
void updateDitherMode(bool _bForce = false); void updateDitherMode(bool _bForce = false);
void updateLOD(bool _bForce = false); void updateLOD(bool _bForce = false);
void updateFBInfo(bool _bForce = false); void updateFrameBufferInfo(bool _bForce = false);
void updateDepthInfo(bool _bForce = false); void updateDepthInfo(bool _bForce = false);
void updateAlphaTestInfo(bool _bForce = false); void updateAlphaTestInfo(bool _bForce = false);
void updateTextureInfo(bool _bForce = false); void updateTextureInfo(bool _bForce = false);

4
src/OGL3X/GLSLCombiner_ogl3x.cpp
View File

@ -508,7 +508,7 @@ void ShaderCombiner::update(bool _bForce) {
#endif #endif
} }
updateFBInfo(true); updateFrameBufferInfo(true);
updateRenderState(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); 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()) if (!usesTexture())
return; return;

2
src/OpenGL.cpp
View File

@ -655,7 +655,7 @@ void OGLRender::_updateStates(RENDER_STATE _renderState) const
else else
textureCache().activateDummy(t); textureCache().activateDummy(t);
} }
pCurrentCombiner->updateFBInfo(); pCurrentCombiner->updateFrameBufferInfo();
} }
if (_renderState == rsTriangle || _renderState == rsLine) if (_renderState == rsTriangle || _renderState == rsLine)
cmbInfo.updateTextureParameters(); cmbInfo.updateTextureParameters();