From ec848de808cdbb51061a3837dab887f082231dd6 Mon Sep 17 00:00:00 2001
From: Jens Hemprich <31758696+jenshemprich@users.noreply.github.com>
Date: Mon, 20 Aug 2007 10:55:44 +0000
Subject: [PATCH] setTextureState() rmoved to set*TextureState()

---
 MacGLide/OpenGLide/GLRenderUpdateState.h | 3 +++
 MacGLide/OpenGLide/grguColorAlpha.cpp    | 2 --
 MacGLide/OpenGLide/grguTex.cpp           | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MacGLide/OpenGLide/GLRenderUpdateState.h b/MacGLide/OpenGLide/GLRenderUpdateState.h
index 86c4452..9b59f69 100644
--- a/MacGLide/OpenGLide/GLRenderUpdateState.h
+++ b/MacGLide/OpenGLide/GLRenderUpdateState.h
@@ -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);
diff --git a/MacGLide/OpenGLide/grguColorAlpha.cpp b/MacGLide/OpenGLide/grguColorAlpha.cpp
index b8a5b47..300ebb6 100644
--- a/MacGLide/OpenGLide/grguColorAlpha.cpp
+++ b/MacGLide/OpenGLide/grguColorAlpha.cpp
@@ -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)
diff --git a/MacGLide/OpenGLide/grguTex.cpp b/MacGLide/OpenGLide/grguTex.cpp
index 7b1bcfd..be1f6de 100644
--- a/MacGLide/OpenGLide/grguTex.cpp
+++ b/MacGLide/OpenGLide/grguTex.cpp
@@ -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)
 	{