From 9fc26ef7750414b316ed856d8c9699e1aa760646 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Sat, 21 Mar 2015 15:25:06 +0600 Subject: [PATCH] Remove CHANGED_COMBINE_COLORS usage. --- Combiner.cpp | 1 - GLSLCombiner.cpp | 2 -- gDP.cpp | 4 ---- gDP.h | 2 +- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Combiner.cpp b/Combiner.cpp index 84f1cc55..c96a61b4 100644 --- a/Combiner.cpp +++ b/Combiner.cpp @@ -235,5 +235,4 @@ void CombinerInfo::setCombine(u64 _mux ) m_combiners[_mux] = m_pCurrent; } m_bChanged = true; - gDP.changed |= CHANGED_COMBINE_COLORS; } diff --git a/GLSLCombiner.cpp b/GLSLCombiner.cpp index e9e9bdfe..619a5b9b 100644 --- a/GLSLCombiner.cpp +++ b/GLSLCombiner.cpp @@ -772,8 +772,6 @@ void ShaderCombiner::updateColors(bool _bForce) _setV4Uniform(m_uniforms.uCenterColor, &gDP.key.center.r, _bForce); _setFUniform(m_uniforms.uK4, gDP.convert.k4*0.0039215689f, _bForce); _setFUniform(m_uniforms.uK5, gDP.convert.k5*0.0039215689f, _bForce); - - gDP.changed &= ~CHANGED_COMBINE_COLORS; } void ShaderCombiner::updateFogMode(bool _bForce) diff --git a/gDP.cpp b/gDP.cpp index f44fafa1..1ce54a49 100644 --- a/gDP.cpp +++ b/gDP.cpp @@ -342,8 +342,6 @@ void gDPSetEnvColor( u32 r, u32 g, u32 b, u32 a ) gDP.envColor.b = b * 0.0039215689f; gDP.envColor.a = a * 0.0039215689f; - gDP.changed |= CHANGED_COMBINE_COLORS; - #ifdef DEBUG DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetEnvColor( %i, %i, %i, %i );\n", r, g, b, a ); @@ -415,8 +413,6 @@ void gDPSetPrimColor( u32 m, u32 l, u32 r, u32 g, u32 b, u32 a ) gDP.primColor.b = b * 0.0039215689f; gDP.primColor.a = a * 0.0039215689f; - gDP.changed |= CHANGED_COMBINE_COLORS; - #ifdef DEBUG DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetPrimColor( %i, %i, %i, %i, %i, %i );\n", m, l, r, g, b, a ); diff --git a/gDP.h b/gDP.h index c500673e..e7159762 100644 --- a/gDP.h +++ b/gDP.h @@ -8,7 +8,7 @@ #define CHANGED_SCISSOR 0x004 #define CHANGED_TMEM 0x008 #define CHANGED_TILE 0x010 -#define CHANGED_COMBINE_COLORS 0x020 +//#define CHANGED_COMBINE_COLORS 0x020 #define CHANGED_COMBINE 0x040 #define CHANGED_ALPHACOMPARE 0x080 #define CHANGED_FOGCOLOR 0x100