From 4078c647d56caf92d0526d3d9aece43e55e63e10 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Fri, 13 Jan 2006 15:11:57 +0000 Subject: [PATCH] namespace pollution fixes (Tilman Sauerbeck) --- src/mesa/drivers/dri/r300/r300_fragprog.c | 8 ++++---- src/mesa/drivers/dri/r300/r300_state.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c index 76799ead35e..f1d27e9785c 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog.c @@ -898,7 +898,7 @@ static void emit_arith(struct r300_fragment_program *rp, int op, return; }; -pfs_reg_t get_attrib(struct r300_fragment_program *rp, GLuint attr) { +static pfs_reg_t get_attrib(struct r300_fragment_program *rp, GLuint attr) { struct fragment_program *mp = &rp->mesa_program; pfs_reg_t r = undef; @@ -1232,7 +1232,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp) /* - Init structures * - Determine what hwregs each input corresponds to */ -void init_program(struct r300_fragment_program *rp) +static void init_program(struct r300_fragment_program *rp) { struct r300_pfs_compile_state *cs = NULL; struct fragment_program *mp = &rp->mesa_program; @@ -1345,7 +1345,7 @@ void init_program(struct r300_fragment_program *rp) } -void update_params(struct r300_fragment_program *rp) { +static void update_params(struct r300_fragment_program *rp) { struct fragment_program *mp = &rp->mesa_program; int i; @@ -1359,7 +1359,7 @@ void update_params(struct r300_fragment_program *rp) { rp->params_uptodate = GL_TRUE; } -void translate_fragment_shader(struct r300_fragment_program *rp) +void r300_translate_fragment_shader(struct r300_fragment_program *rp) { struct r300_pfs_compile_state *cs = NULL; diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index a31d0875f6b..935263e258d 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1747,7 +1747,7 @@ void r300SetupPixelShader(r300ContextPtr rmesa) if (!rp) /* should only happenen once, just after context is created */ return; - translate_fragment_shader(rp); + r300_translate_fragment_shader(rp); if (!rp->translated) { fprintf(stderr, "%s: No valid fragment shader, exiting\n", __func__); exit(-1); -- 2.30.2