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

Remove CHANGED_COMBINE_COLORS usage.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-03-21 15:25:06 +06:00
parent 3961b5e368
commit 9fc26ef775
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Combiner.cpp
View File

@ -235,5 +235,4 @@ void CombinerInfo::setCombine(u64 _mux )
m_combiners[_mux] = m_pCurrent;
}
m_bChanged = true;
gDP.changed |= CHANGED_COMBINE_COLORS;
}

2
GLSLCombiner.cpp
View File

@ -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)

4
gDP.cpp
View File

@ -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 );

2
gDP.h
View File

@ -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