From 82de92c0fb329b464fe19d6cc45080174e019795 Mon Sep 17 00:00:00 2001
From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Sun, 13 May 2007 08:59:54 +0000
Subject: [PATCH] r300: Changed a couple of functions in r300_state.c to static
 functions.

---
 src/mesa/drivers/dri/r300/r300_state.c | 34 +++++++++++++-------------
 src/mesa/drivers/dri/r300/r300_state.h |  1 -
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index cb34b8a7221..f7296ebb123 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1439,7 +1439,7 @@ union r300_outputs_written {
 	((hw_tcl_on) ? (ow).vp_outputs & (1 << (vp_result)) : \
 	RENDERINPUTS_TEST( (ow.index_bitset), (tnl_attrib) ))
 
-void r300SetupRSUnit(GLcontext * ctx)
+static void r300SetupRSUnit(GLcontext * ctx)
 {
 	r300ContextPtr r300 = R300_CONTEXT(ctx);
 	/* I'm still unsure if these are needed */
@@ -1858,22 +1858,7 @@ void r300UpdateShaders(r300ContextPtr rmesa)
 
 }
 
-void r300UpdateShaderStates(r300ContextPtr rmesa)
-{
-	GLcontext *ctx;
-	ctx = rmesa->radeon.glCtx;
-
-	r300UpdateTextureState(ctx);
-
-	r300SetupPixelShader(rmesa);
-	r300SetupTextures(ctx);
-
-	if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
-		r300SetupVertexShader(rmesa);
-	r300SetupRSUnit(ctx);
-}
-
-void r300SetupPixelShader(r300ContextPtr rmesa)
+static void r300SetupPixelShader(r300ContextPtr rmesa)
 {
 	GLcontext *ctx = rmesa->radeon.glCtx;
 	struct r300_fragment_program *fp = (struct r300_fragment_program *)
@@ -1947,6 +1932,21 @@ void r300SetupPixelShader(r300ContextPtr rmesa)
 	    cmdpacket0(R300_PFS_PARAM_0_X, fp->const_nr * 4);
 }
 
+void r300UpdateShaderStates(r300ContextPtr rmesa)
+{
+	GLcontext *ctx;
+	ctx = rmesa->radeon.glCtx;
+
+	r300UpdateTextureState(ctx);
+
+	r300SetupPixelShader(rmesa);
+	r300SetupTextures(ctx);
+
+	if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
+		r300SetupVertexShader(rmesa);
+	r300SetupRSUnit(ctx);
+}
+
 /**
  * Called by Mesa after an internal state update.
  */
diff --git a/src/mesa/drivers/dri/r300/r300_state.h b/src/mesa/drivers/dri/r300/r300_state.h
index 3b9d8e74041..311e97daa8c 100644
--- a/src/mesa/drivers/dri/r300/r300_state.h
+++ b/src/mesa/drivers/dri/r300/r300_state.h
@@ -67,7 +67,6 @@ extern void r300UpdateViewportOffset(GLcontext * ctx);
 extern void r300UpdateWindow(GLcontext * ctx);
 extern void r300UpdateDrawBuffer(GLcontext * ctx);
 extern void r300SetupVertexShader(r300ContextPtr rmesa);
-extern void r300SetupPixelShader(r300ContextPtr rmesa);
 
 extern void r300UpdateShaders(r300ContextPtr rmesa);
 extern void r300UpdateShaderStates(r300ContextPtr rmesa);
-- 
2.30.2