Macintosh-SW
/
MacGLide
mirror of https://github.com/jenshemprich/MacGLide.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

setTextureState() rmoved to set*TextureState()

This commit is contained in:
Jens Hemprich 2007-08-20 10:55:44 +00:00
parent e3574f169d
commit ec848de808
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MacGLide/OpenGLide/GLRenderUpdateState.h
View File

@ -29,6 +29,7 @@ extern bool s_bForceChromaKeyAndAlphaStateUpdate;
// (Deferred inlining) // (Deferred inlining)
inline void SetChromaKeyAndAlphaState(); inline void SetChromaKeyAndAlphaState();
inline void SetAlphaCombineState(); inline void SetAlphaCombineState();
inline void SetTextureState();
inline void ForceChromaKeyAndAlphaStateUpdate() inline void ForceChromaKeyAndAlphaStateUpdate()
{ {
@ -50,6 +51,7 @@ inline void SetColorTextureState()
{ {
OpenGL.ColorTexture = false; OpenGL.ColorTexture = false;
} }
SetTextureState();
#ifdef OPENGL_DEBUG #ifdef OPENGL_DEBUG
GlideMsg( "OpenGL.ColorTexture = %d\n", OpenGL.ColorTexture); GlideMsg( "OpenGL.ColorTexture = %d\n", OpenGL.ColorTexture);
@ -85,6 +87,7 @@ inline void SetAlphaTextureState()
OpenGL.AlphaTexture = false; OpenGL.AlphaTexture = false;
} }
} }
SetTextureState();
#ifdef OPENGL_DEBUG #ifdef OPENGL_DEBUG
GlideMsg( "OpenGL.AlphaTexture = %d\n", OpenGL.AlphaTexture); GlideMsg( "OpenGL.AlphaTexture = %d\n", OpenGL.AlphaTexture);

2
MacGLide/OpenGLide/grguColorAlpha.cpp
View File

@ -171,7 +171,6 @@ grColorCombine( GrCombineFunction_t function, GrCombineFactor_t factor,
ColorFactor3Func = colorCombineTable[ factor ][ function ].factorfunc; ColorFactor3Func = colorCombineTable[ factor ][ function ].factorfunc;
SetColorTextureState(); SetColorTextureState();
SetTextureState();
SetColorCombineState(); SetColorCombineState();
VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1); VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1);
@ -529,7 +528,6 @@ grAlphaCombine( GrCombineFunction_t function, GrCombineFactor_t factor,
SetAlphaTextureState(); SetAlphaTextureState();
VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1); VERIFY_ACTIVE_TEXTURE_UNIT(OpenGL.ColorAlphaUnit1);
SetTextureState();
#ifdef OPTIMISE_OPENGL_STATE_CHANGES #ifdef OPTIMISE_OPENGL_STATE_CHANGES
if (bUpdateColorCombineState) if (bUpdateColorCombineState)

2
MacGLide/OpenGLide/grguTex.cpp
View File

@ -540,7 +540,6 @@ grTexCombine( GrChipID_t tmu,
Glide.State.TextureCombineCFunction = rgb_function; Glide.State.TextureCombineCFunction = rgb_function;
Glide.State.TextureCombineCFactor = rgb_factor; Glide.State.TextureCombineCFactor = rgb_factor;
SetColorTextureState(); SetColorTextureState();
SetTextureState();
} }
if (Glide.State.TextureCombineAFunction != alpha_function || if (Glide.State.TextureCombineAFunction != alpha_function ||
Glide.State.TextureCombineAFactor != alpha_factor) Glide.State.TextureCombineAFactor != alpha_factor)
@ -548,7 +547,6 @@ grTexCombine( GrChipID_t tmu,
Glide.State.TextureCombineAFunction = alpha_function; Glide.State.TextureCombineAFunction = alpha_function;
Glide.State.TextureCombineAFactor = alpha_factor; Glide.State.TextureCombineAFactor = alpha_factor;
SetAlphaTextureState(); SetAlphaTextureState();
SetTextureState();
} }
if (Glide.State.TextureCombineRGBInvert != rgb_invert) if (Glide.State.TextureCombineRGBInvert != rgb_invert)
{ {