r300: Fixed some more function names.

Note there might be some calls to the old function names in conditionally
disabled code, but I think I've got them all.

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 37cb508..369dc0b 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -127,7 +127,7 @@ int r300FlushCmdBuf(r300ContextPtr r300, const char *caller)
        return ret;
 }
 
-void r300_print_state_atom(r300ContextPtr r300, struct r300_state_atom *state)
+void r300PrintStateAtom(r300ContextPtr r300, struct r300_state_atom *state)
 {
        int i;
        int dwords = (*state->check) (r300, state);
@@ -160,7 +160,7 @@ static __inline__ void r300DoEmitState(r300ContextPtr r300, GLboolean dirty)
                                int dwords = (*atom->check) (r300, atom);
 
                                if (dwords)
-                                       r300_print_state_atom(r300, atom);
+                                       r300PrintStateAtom(r300, atom);
                                else
                                        fprintf(stderr,
                                                "  skip state %s\n",

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index b7d2552..31ce210 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -902,9 +902,9 @@ extern GLboolean r300CreateContext(const __GLcontextModes * glVisual,
                                   __DRIcontextPrivate * driContextPriv,
                                   void *sharedContextPrivate);
 
-extern int r300_get_num_verts(r300ContextPtr rmesa, int num_verts, int prim);
+extern int r300NumVerts(r300ContextPtr rmesa, int num_verts, int prim);
 
-extern void r300_select_vertex_shader(r300ContextPtr r300);
+extern void r300SelectVertexShader(r300ContextPtr r300);
 extern void r300InitShaderFuncs(struct dd_function_table *functions);
 extern int r300VertexProgUpdateParams(GLcontext * ctx,
                                      struct r300_vertex_program_cont *vp,

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 0efdf68..7a82dc4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -2209,7 +2209,7 @@ static void update_params(struct r300_fragment_program *rp)
                _mesa_load_state_parameters(rp->ctx, mp->Base.Parameters);
 }
 
-void r300_translate_fragment_shader(r300ContextPtr r300,
+void r300TranslateFragmentShader(r300ContextPtr r300,
                                    struct r300_fragment_program *rp)
 {
        struct r300_pfs_compile_state *cs = NULL;

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index 79f3e70..218a3c9 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.h
@@ -98,7 +98,7 @@ typedef struct r300_fragment_program_swizzle {
 
 struct r300_fragment_program;
 
-extern void r300_translate_fragment_shader(r300ContextPtr r300,
+extern void r300TranslateFragmentShader(r300ContextPtr r300,
                                           struct r300_fragment_program *rp);
 
 #endif

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index c0ce8c0..a4b8be2 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -343,7 +343,7 @@ int r300Fallback(GLcontext * ctx)
 
        if (fp) {
                if (!fp->translated)
-                       r300_translate_fragment_shader(r300, fp);
+                       r300TranslateFragmentShader(r300, fp);
                FALLBACK_IF(!fp->translated);
        }
 

diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index 0953d32..f54a4f9 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -64,7 +64,7 @@ r300ProgramStringNotify(GLcontext * ctx, GLenum target, struct gl_program *prog)
                vp->progs = NULL;
                /*vp->translated = GL_FALSE;
                   memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program)); */
-               /*r300_translate_vertex_shader(vp); */
+               /*r300TranslateVertexShader(vp); */
                break;
        case GL_FRAGMENT_PROGRAM_ARB:
                fp->translated = GL_FALSE;

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 2d5b10d..5a7ba8d 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -166,7 +166,7 @@ static int blend_factor(GLenum factor, GLboolean is_src)
  */
 
 /* helper function */
-static void r300_set_blend_cntl(r300ContextPtr r300, int func, int eqn,
+static void r300SetBlendCntl(r300ContextPtr r300, int func, int eqn,
                                int cbits, int funcA, int eqnA)
 {
        GLuint new_ablend, new_cblend;
@@ -200,7 +200,7 @@ static void r300_set_blend_cntl(r300ContextPtr r300, int func, int eqn,
        }
 }
 
-static void r300_set_blend_state(GLcontext * ctx)
+static void r300SetBlendState(GLcontext * ctx)
 {
        r300ContextPtr r300 = R300_CONTEXT(ctx);
        int func = (R300_BLEND_GL_ONE << R300_SRC_BLEND_SHIFT) |
@@ -211,7 +211,7 @@ static void r300_set_blend_state(GLcontext * ctx)
        int eqnA = R300_COMB_FCN_ADD_CLAMP;
 
        if (RGBA_LOGICOP_ENABLED(ctx) || !ctx->Color.BlendEnabled) {
-               r300_set_blend_cntl(r300, func, eqn, 0, func, eqn);
+               r300SetBlendCntl(r300, func, eqn, 0, func, eqn);
                return;
        }
 
@@ -291,7 +291,7 @@ static void r300_set_blend_state(GLcontext * ctx)
                return;
        }
 
-       r300_set_blend_cntl(r300,
+       r300SetBlendCntl(r300,
                            func, eqn,
                            R300_BLEND_UNKNOWN | R300_BLEND_ENABLE, funcA,
                            eqnA);
@@ -300,14 +300,14 @@ static void r300_set_blend_state(GLcontext * ctx)
 static void r300BlendEquationSeparate(GLcontext * ctx,
                                      GLenum modeRGB, GLenum modeA)
 {
-       r300_set_blend_state(ctx);
+       r300SetBlendState(ctx);
 }
 
 static void r300BlendFuncSeparate(GLcontext * ctx,
                                  GLenum sfactorRGB, GLenum dfactorRGB,
                                  GLenum sfactorA, GLenum dfactorA)
 {
-       r300_set_blend_state(ctx);
+       r300SetBlendState(ctx);
 }
 
 /**
@@ -510,7 +510,7 @@ static void r300Enable(GLcontext * ctx, GLenum cap, GLboolean state)
 
        case GL_BLEND:
        case GL_COLOR_LOGIC_OP:
-               r300_set_blend_state(ctx);
+               r300SetBlendState(ctx);
                break;
 
        case GL_DEPTH_TEST:
@@ -1280,7 +1280,7 @@ static unsigned long gen_fixed_filter(unsigned long f)
        return f;
 }
 
-void r300_setup_textures(GLcontext * ctx)
+static void r300SetupTextures(GLcontext * ctx)
 {
        int i, mtu;
        struct r300_tex_obj *t;
@@ -1442,7 +1442,7 @@ union r300_outputs_written {
        ((hw_tcl_on) ? (ow).vp_outputs & (1 << (vp_result)) : \
        RENDERINPUTS_TEST( (ow.index_bitset), (tnl_attrib) ))
 
-void r300_setup_rs_unit(GLcontext * ctx)
+void r300SetupRSUnit(GLcontext * ctx)
 {
        r300ContextPtr r300 = R300_CONTEXT(ctx);
        /* I'm still unsure if these are needed */
@@ -1844,11 +1844,11 @@ void r300UpdateShaders(r300ContextPtr rmesa)
                            rmesa->temp_attrib[i];
                }
 
-               r300_select_vertex_shader(rmesa);
+               r300SelectVertexShader(rmesa);
                vp = (struct r300_vertex_program *)
                    CURRENT_VERTEX_SHADER(ctx);
                /*if (vp->translated == GL_FALSE)
-                  r300_translate_vertex_shader(vp); */
+                  r300TranslateVertexShader(vp); */
                if (vp->translated == GL_FALSE) {
                        fprintf(stderr, "Failing back to sw-tcl\n");
                        hw_tcl_on = future_hw_tcl_on = 0;
@@ -1869,11 +1869,11 @@ void r300UpdateShaderStates(r300ContextPtr rmesa)
        r300UpdateTextureState(ctx);
 
        r300SetupPixelShader(rmesa);
-       r300_setup_textures(ctx);
+       r300SetupTextures(ctx);
 
        if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
                r300SetupVertexShader(rmesa);
-       r300_setup_rs_unit(ctx);
+       r300SetupRSUnit(ctx);
 }
 
 /* This is probably wrong for some values, I need to test this
@@ -1917,7 +1917,7 @@ void r300SetupPixelShader(r300ContextPtr rmesa)
        if (!rp)                /* should only happenen once, just after context is created */
                return;
 
-       r300_translate_fragment_shader(rmesa, rp);
+       r300TranslateFragmentShader(rmesa, rp);
        if (!rp->translated) {
                fprintf(stderr, "%s: No valid fragment shader, exiting\n",
                        __func__);
@@ -2051,7 +2051,7 @@ void r300ResetHwState(r300ContextPtr r300)
 
        r300UpdateTextureState(ctx);
 
-       r300_set_blend_state(ctx);
+       r300SetBlendState(ctx);
 
        r300AlphaFunc(ctx, ctx->Color.AlphaFunc, ctx->Color.AlphaRef);
        r300Enable(ctx, GL_ALPHA_TEST, ctx->Color.AlphaEnabled);

diff --git a/src/mesa/drivers/dri/r300/r300_state.h b/src/mesa/drivers/dri/r300/r300_state.h
index 59e6bae..00323cd 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.h
+++ b/src/mesa/drivers/dri/r300/r300_state.h
@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
        } while(0)
 
 #define R300_PRINT_STATE(r300, atom) \
-               r300_print_state_atom(r300, &r300->hw.atom)
+               r300PrintStateAtom(r300, &r300->hw.atom)
 
 /* Fire the buffered vertices no matter what.
    TODO: This has not been implemented yet
@@ -69,12 +69,10 @@ extern void r300UpdateDrawBuffer(GLcontext * ctx);
 extern void r300SetupVertexShader(r300ContextPtr rmesa);
 extern void r300SetupPixelShader(r300ContextPtr rmesa);
 
-extern void r300_setup_textures(GLcontext * ctx);
-extern void r300_setup_rs_unit(GLcontext * ctx);
 extern void r300UpdateShaders(r300ContextPtr rmesa);
 extern void r300UpdateShaderStates(r300ContextPtr rmesa);
 
-extern void r300_print_state_atom(r300ContextPtr r300,
+extern void r300PrintStateAtom(r300ContextPtr r300,
                                  struct r300_state_atom *state);
 
 #endif                         /* __R300_STATE_H__ */

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 3e664e9..b0a7a66 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -410,7 +410,7 @@ static GLboolean valid_dst(struct r300_vertex_program *vp,
                u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1; \
        } while (0)
 
-static void r300_translate_vertex_shader(struct r300_vertex_program *vp,
+static void r300TranslateVertexShader(struct r300_vertex_program *vp,
                                         struct prog_instruction *vpi)
 {
        int i, cur_reg = 0;
@@ -1236,12 +1236,12 @@ static struct r300_vertex_program *build_program(struct r300_vertex_program_key
 
        vp->num_temporaries = mesa_vp->Base.NumTemporaries;
 
-       r300_translate_vertex_shader(vp, mesa_vp->Base.Instructions);
+       r300TranslateVertexShader(vp, mesa_vp->Base.Instructions);
 
        return vp;
 }
 
-void r300_select_vertex_shader(r300ContextPtr r300)
+void r300SelectVertexShader(r300ContextPtr r300)
 {
        GLcontext *ctx = ctx = r300->radeon.glCtx;
        GLuint InputsRead;

diff --git a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
index bdd731f..f9c4e2d 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
+++ b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
@@ -205,7 +205,7 @@ static void radeonDrawRangeElements(GLcontext *ctx,
                    mode == GL_TRIANGLES) {
                        
                        while (count) {
-                               i = r300_get_num_verts(rmesa, MIN2(count, 65535), mode);
+                               i = r300NumVerts(rmesa, MIN2(count, 65535), mode);
                                
                                radeonDrawRangeElements(mode, min, max, i, type, indices);