summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-13 08:59:54 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-13 08:59:54 +0000
commit82de92c0fb329b464fe19d6cc45080174e019795 (patch)
tree840d26b36c1b12c717d29920cc6d2bbb0b30f553 /src/mesa/drivers/dri/r300
parente4b8481f396d0347f10eb51486c7fe5b01252457 (diff)
r300: Changed a couple of functions in r300_state.c to static functions.
Diffstat (limited to 'src/mesa/drivers/dri/r300')
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c34
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.h1
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 cb34b8a722..f7296ebb12 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 3b9d8e7404..311e97daa8 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);