mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
Remove CHANGED_COMBINE_COLORS usage.
This commit is contained in:
parent
3961b5e368
commit
9fc26ef775
|
@ -235,5 +235,4 @@ void CombinerInfo::setCombine(u64 _mux )
|
||||||
m_combiners[_mux] = m_pCurrent;
|
m_combiners[_mux] = m_pCurrent;
|
||||||
}
|
}
|
||||||
m_bChanged = true;
|
m_bChanged = true;
|
||||||
gDP.changed |= CHANGED_COMBINE_COLORS;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -772,8 +772,6 @@ void ShaderCombiner::updateColors(bool _bForce)
|
||||||
_setV4Uniform(m_uniforms.uCenterColor, &gDP.key.center.r, _bForce);
|
_setV4Uniform(m_uniforms.uCenterColor, &gDP.key.center.r, _bForce);
|
||||||
_setFUniform(m_uniforms.uK4, gDP.convert.k4*0.0039215689f, _bForce);
|
_setFUniform(m_uniforms.uK4, gDP.convert.k4*0.0039215689f, _bForce);
|
||||||
_setFUniform(m_uniforms.uK5, gDP.convert.k5*0.0039215689f, _bForce);
|
_setFUniform(m_uniforms.uK5, gDP.convert.k5*0.0039215689f, _bForce);
|
||||||
|
|
||||||
gDP.changed &= ~CHANGED_COMBINE_COLORS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShaderCombiner::updateFogMode(bool _bForce)
|
void ShaderCombiner::updateFogMode(bool _bForce)
|
||||||
|
|
4
gDP.cpp
4
gDP.cpp
|
@ -342,8 +342,6 @@ void gDPSetEnvColor( u32 r, u32 g, u32 b, u32 a )
|
||||||
gDP.envColor.b = b * 0.0039215689f;
|
gDP.envColor.b = b * 0.0039215689f;
|
||||||
gDP.envColor.a = a * 0.0039215689f;
|
gDP.envColor.a = a * 0.0039215689f;
|
||||||
|
|
||||||
gDP.changed |= CHANGED_COMBINE_COLORS;
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetEnvColor( %i, %i, %i, %i );\n",
|
DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetEnvColor( %i, %i, %i, %i );\n",
|
||||||
r, g, b, a );
|
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.b = b * 0.0039215689f;
|
||||||
gDP.primColor.a = a * 0.0039215689f;
|
gDP.primColor.a = a * 0.0039215689f;
|
||||||
|
|
||||||
gDP.changed |= CHANGED_COMBINE_COLORS;
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetPrimColor( %i, %i, %i, %i, %i, %i );\n",
|
DebugMsg( DEBUG_HIGH | DEBUG_HANDLED | DEBUG_COMBINE, "gDPSetPrimColor( %i, %i, %i, %i, %i, %i );\n",
|
||||||
m, l, r, g, b, a );
|
m, l, r, g, b, a );
|
||||||
|
|
2
gDP.h
2
gDP.h
|
@ -8,7 +8,7 @@
|
||||||
#define CHANGED_SCISSOR 0x004
|
#define CHANGED_SCISSOR 0x004
|
||||||
#define CHANGED_TMEM 0x008
|
#define CHANGED_TMEM 0x008
|
||||||
#define CHANGED_TILE 0x010
|
#define CHANGED_TILE 0x010
|
||||||
#define CHANGED_COMBINE_COLORS 0x020
|
//#define CHANGED_COMBINE_COLORS 0x020
|
||||||
#define CHANGED_COMBINE 0x040
|
#define CHANGED_COMBINE 0x040
|
||||||
#define CHANGED_ALPHACOMPARE 0x080
|
#define CHANGED_ALPHACOMPARE 0x080
|
||||||
#define CHANGED_FOGCOLOR 0x100
|
#define CHANGED_FOGCOLOR 0x100
|
||||||
|
|
Loading…
Reference in New Issue
Block a user