setTextureState() rmoved to set*TextureState()
This commit is contained in:
parent
e3574f169d
commit
ec848de808
|
@ -29,6 +29,7 @@ extern bool s_bForceChromaKeyAndAlphaStateUpdate;
|
|||
// (Deferred inlining)
|
||||
inline void SetChromaKeyAndAlphaState();
|
||||
inline void SetAlphaCombineState();
|
||||
inline void SetTextureState();
|
||||
|
||||
inline void ForceChromaKeyAndAlphaStateUpdate()
|
||||
{
|
||||
|
@ -50,6 +51,7 @@ inline void SetColorTextureState()
|
|||
{
|
||||
OpenGL.ColorTexture = false;
|
||||
}
|
||||
SetTextureState();
|
||||
|
||||
#ifdef OPENGL_DEBUG
|
||||
GlideMsg( "OpenGL.ColorTexture = %d\n", OpenGL.ColorTexture);
|
||||
|
@ -85,6 +87,7 @@ inline void SetAlphaTextureState()
|
|||
OpenGL.AlphaTexture = false;
|
||||
}
|
||||
}
|
||||
SetTextureState();
|
||||
|
||||
#ifdef OPENGL_DEBUG
|
||||
GlideMsg( "OpenGL.AlphaTexture = %d\n", OpenGL.AlphaTexture);
|
||||
|
|
|
@ -171,7 +171,6 @@ grColorCombine( GrCombineFunction_t function, GrCombineFactor_t factor,
|
|||
ColorFactor3Func = colorCombineTable[ factor ][ function ].factorfunc;
|
||||
|
||||
SetColorTextureState();
|
||||
SetTextureState();
|
||||
SetColorCombineState();
|
||||
|
||||
VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1);
|
||||
|
@ -529,7 +528,6 @@ grAlphaCombine( GrCombineFunction_t function, GrCombineFactor_t factor,
|
|||
|
||||
SetAlphaTextureState();
|
||||
VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1);
|
||||
SetTextureState();
|
||||
|
||||
#ifdef OPTIMISE_OPENGL_STATE_CHANGES
|
||||
if (bUpdateColorCombineState)
|
||||
|
|
|
@ -540,7 +540,6 @@ grTexCombine( GrChipID_t tmu,
|
|||
Glide.State.TextureCombineCFunction = rgb_function;
|
||||
Glide.State.TextureCombineCFactor = rgb_factor;
|
||||
SetColorTextureState();
|
||||
SetTextureState();
|
||||
}
|
||||
if (Glide.State.TextureCombineAFunction != alpha_function ||
|
||||
Glide.State.TextureCombineAFactor != alpha_factor)
|
||||
|
@ -548,7 +547,6 @@ grTexCombine( GrChipID_t tmu,
|
|||
Glide.State.TextureCombineAFunction = alpha_function;
|
||||
Glide.State.TextureCombineAFactor = alpha_factor;
|
||||
SetAlphaTextureState();
|
||||
SetTextureState();
|
||||
}
|
||||
if (Glide.State.TextureCombineRGBInvert != rgb_invert)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue