r600g: cleanup state function names

Reviewed-by: Jerome Glisse <jglisse@redhat.com>

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index b8cfac2a4c3079480f0fd6d969e5f059889f2617..4d88e83c5e4cdacf9f29c1be21555f4b9d536db2 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -2109,7 +2109,7 @@ static void evergreen_emit_ps_sampler_views(struct r600_context *rctx, struct r6
        evergreen_emit_sampler_views(rctx, &rctx->ps_samplers.views, R600_MAX_CONST_BUFFERS);
 }
 
-static void evergreen_emit_sampler(struct r600_context *rctx,
+static void evergreen_emit_sampler_states(struct r600_context *rctx,
                                struct r600_textures_info *texinfo,
                                unsigned resource_id_base,
                                unsigned border_index_reg)
@@ -2134,14 +2134,14 @@ static void evergreen_emit_sampler(struct r600_context *rctx,
        }
 }
 
-static void evergreen_emit_vs_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void evergreen_emit_vs_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler(rctx, &rctx->vs_samplers, 18, R_00A414_TD_VS_SAMPLER0_BORDER_INDEX);
+       evergreen_emit_sampler_states(rctx, &rctx->vs_samplers, 18, R_00A414_TD_VS_SAMPLER0_BORDER_INDEX);
 }
 
-static void evergreen_emit_ps_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void evergreen_emit_ps_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler(rctx, &rctx->ps_samplers, 0, R_00A400_TD_PS_SAMPLER0_BORDER_INDEX);
+       evergreen_emit_sampler_states(rctx, &rctx->ps_samplers, 0, R_00A400_TD_PS_SAMPLER0_BORDER_INDEX);
 }
 
 static void evergreen_emit_sample_mask(struct r600_context *rctx, struct r600_atom *a)
@@ -2184,8 +2184,8 @@ void evergreen_init_state_functions(struct r600_context *rctx)
        /* shader program */
        r600_init_atom(rctx, &rctx->cs_shader_state.atom, id++, evergreen_emit_cs_shader, 0);
        /* sampler */
-       r600_init_atom(rctx, &rctx->vs_samplers.atom_sampler, id++, evergreen_emit_vs_sampler, 0);
-       r600_init_atom(rctx, &rctx->ps_samplers.atom_sampler, id++, evergreen_emit_ps_sampler, 0);
+       r600_init_atom(rctx, &rctx->vs_samplers.atom_sampler, id++, evergreen_emit_vs_sampler_states, 0);
+       r600_init_atom(rctx, &rctx->ps_samplers.atom_sampler, id++, evergreen_emit_ps_sampler_states, 0);
        /* resources */
        r600_init_atom(rctx, &rctx->vertex_buffer_state.atom, id++, evergreen_fs_emit_vertex_buffers, 0);
        r600_init_atom(rctx, &rctx->cs_vertex_buffer_state.atom, id++, evergreen_cs_emit_vertex_buffers, 0);

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index d3b3d798e04d9ebeb50bc16a2555d82e3edcc903..aca5e3cb8e50c3f9b2492de3035cd822a1f6cdf1 100644 (file)
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -1961,7 +1961,7 @@ static void r600_emit_ps_sampler_views(struct r600_context *rctx, struct r600_at
        r600_emit_sampler_views(rctx, &rctx->ps_samplers.views, R600_MAX_CONST_BUFFERS);
 }
 
-static void r600_emit_sampler(struct r600_context *rctx,
+static void r600_emit_sampler_states(struct r600_context *rctx,
                                struct r600_textures_info *texinfo,
                                unsigned resource_id_base,
                                unsigned border_color_reg)
@@ -2005,14 +2005,14 @@ static void r600_emit_sampler(struct r600_context *rctx,
        }
 }
 
-static void r600_emit_vs_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void r600_emit_vs_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       r600_emit_sampler(rctx, &rctx->vs_samplers, 18, R_00A600_TD_VS_SAMPLER0_BORDER_RED);
+       r600_emit_sampler_states(rctx, &rctx->vs_samplers, 18, R_00A600_TD_VS_SAMPLER0_BORDER_RED);
 }
 
-static void r600_emit_ps_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void r600_emit_ps_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       r600_emit_sampler(rctx, &rctx->ps_samplers, 0, R_00A400_TD_PS_SAMPLER0_BORDER_RED);
+       r600_emit_sampler_states(rctx, &rctx->ps_samplers, 0, R_00A400_TD_PS_SAMPLER0_BORDER_RED);
 }
 
 static void r600_emit_seamless_cube_map(struct r600_context *rctx, struct r600_atom *atom)
@@ -2060,8 +2060,8 @@ void r600_init_state_functions(struct r600_context *rctx)
        /* sampler must be emited before TA_CNTL_AUX otherwise DISABLE_CUBE_WRAP change
         * does not take effect (TA_CNTL_AUX emited by r600_emit_seamless_cube_map)
         */
-       r600_init_atom(rctx, &rctx->vs_samplers.atom_sampler, id++, r600_emit_vs_sampler, 0);
-       r600_init_atom(rctx, &rctx->ps_samplers.atom_sampler, id++, r600_emit_ps_sampler, 0);
+       r600_init_atom(rctx, &rctx->vs_samplers.atom_sampler, id++, r600_emit_vs_sampler_states, 0);
+       r600_init_atom(rctx, &rctx->ps_samplers.atom_sampler, id++, r600_emit_ps_sampler_states, 0);
        /* resource */
        r600_init_atom(rctx, &rctx->vs_samplers.views.atom, id++, r600_emit_vs_sampler_views, 0);
        r600_init_atom(rctx, &rctx->ps_samplers.views.atom, id++, r600_emit_ps_sampler_views, 0);

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 9b7400a30672b63405439ec4aaa07ebac5c24e96..4df3c78e1635ccc60def73f9a810a3bab76c535a 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -346,7 +346,7 @@ static void r600_sampler_view_destroy(struct pipe_context *ctx,
        FREE(resource);
 }
 
-static void r600_bind_samplers(struct pipe_context *pipe,
+static void r600_bind_sampler_states(struct pipe_context *pipe,
                                unsigned shader,
                               unsigned start,
                               unsigned count, void **states)
@@ -399,17 +399,17 @@ static void r600_bind_samplers(struct pipe_context *pipe,
        }
 }
 
-static void r600_bind_vs_samplers(struct pipe_context *ctx, unsigned count, void **states)
+static void r600_bind_vs_sampler_states(struct pipe_context *ctx, unsigned count, void **states)
 {
-       r600_bind_samplers(ctx, PIPE_SHADER_VERTEX, 0, count, states);
+       r600_bind_sampler_states(ctx, PIPE_SHADER_VERTEX, 0, count, states);
 }
 
-static void r600_bind_ps_samplers(struct pipe_context *ctx, unsigned count, void **states)
+static void r600_bind_ps_sampler_states(struct pipe_context *ctx, unsigned count, void **states)
 {
-       r600_bind_samplers(ctx, PIPE_SHADER_FRAGMENT, 0, count, states);
+       r600_bind_sampler_states(ctx, PIPE_SHADER_FRAGMENT, 0, count, states);
 }
 
-static void r600_delete_sampler(struct pipe_context *ctx, void *state)
+static void r600_delete_sampler_state(struct pipe_context *ctx, void *state)
 {
        free(state);
 }
@@ -440,7 +440,7 @@ static void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
        }
 }
 
-static void r600_delete_vertex_element(struct pipe_context *ctx, void *state)
+static void r600_delete_vertex_elements(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_vertex_element *v = (struct r600_vertex_element*)state;
@@ -757,19 +757,19 @@ static void *r600_create_shader_state(struct pipe_context *ctx,
        return sel;
 }
 
-static void *r600_create_shader_state_ps(struct pipe_context *ctx,
+static void *r600_create_ps_state(struct pipe_context *ctx,
                                         const struct pipe_shader_state *state)
 {
        return r600_create_shader_state(ctx, state, PIPE_SHADER_FRAGMENT);
 }
 
-static void *r600_create_shader_state_vs(struct pipe_context *ctx,
+static void *r600_create_vs_state(struct pipe_context *ctx,
                                         const struct pipe_shader_state *state)
 {
        return r600_create_shader_state(ctx, state, PIPE_SHADER_VERTEX);
 }
 
-static void r600_bind_ps_shader(struct pipe_context *ctx, void *state)
+static void r600_bind_ps_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
@@ -797,7 +797,7 @@ static void r600_bind_ps_shader(struct pipe_context *ctx, void *state)
        }
 }
 
-static void r600_bind_vs_shader(struct pipe_context *ctx, void *state)
+static void r600_bind_vs_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
 
@@ -826,7 +826,7 @@ static void r600_delete_shader_selector(struct pipe_context *ctx,
 }
 
 
-static void r600_delete_ps_shader(struct pipe_context *ctx, void *state)
+static void r600_delete_ps_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_shader_selector *sel = (struct r600_pipe_shader_selector *)state;
@@ -838,7 +838,7 @@ static void r600_delete_ps_shader(struct pipe_context *ctx, void *state)
        r600_delete_shader_selector(ctx, sel);
 }
 
-static void r600_delete_vs_shader(struct pipe_context *ctx, void *state)
+static void r600_delete_vs_state(struct pipe_context *ctx, void *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_shader_selector *sel = (struct r600_pipe_shader_selector *)state;
@@ -1460,24 +1460,24 @@ unsigned r600_tex_compare(unsigned compare)
 /* keep this at the end of this file, please */
 void r600_init_common_state_functions(struct r600_context *rctx)
 {
-       rctx->context.create_fs_state = r600_create_shader_state_ps;
-       rctx->context.create_vs_state = r600_create_shader_state_vs;
+       rctx->context.create_fs_state = r600_create_ps_state;
+       rctx->context.create_vs_state = r600_create_vs_state;
        rctx->context.create_vertex_elements_state = r600_create_vertex_elements;
        rctx->context.bind_blend_state = r600_bind_blend_state;
        rctx->context.bind_depth_stencil_alpha_state = r600_bind_dsa_state;
-       rctx->context.bind_fragment_sampler_states = r600_bind_ps_samplers;
-       rctx->context.bind_fs_state = r600_bind_ps_shader;
+       rctx->context.bind_fragment_sampler_states = r600_bind_ps_sampler_states;
+       rctx->context.bind_fs_state = r600_bind_ps_state;
        rctx->context.bind_rasterizer_state = r600_bind_rs_state;
        rctx->context.bind_vertex_elements_state = r600_bind_vertex_elements;
-       rctx->context.bind_vertex_sampler_states = r600_bind_vs_samplers;
-       rctx->context.bind_vs_state = r600_bind_vs_shader;
+       rctx->context.bind_vertex_sampler_states = r600_bind_vs_sampler_states;
+       rctx->context.bind_vs_state = r600_bind_vs_state;
        rctx->context.delete_blend_state = r600_delete_state;
        rctx->context.delete_depth_stencil_alpha_state = r600_delete_state;
-       rctx->context.delete_fs_state = r600_delete_ps_shader;
+       rctx->context.delete_fs_state = r600_delete_ps_state;
        rctx->context.delete_rasterizer_state = r600_delete_rs_state;
-       rctx->context.delete_sampler_state = r600_delete_sampler;
-       rctx->context.delete_vertex_elements_state = r600_delete_vertex_element;
-       rctx->context.delete_vs_state = r600_delete_vs_shader;
+       rctx->context.delete_sampler_state = r600_delete_sampler_state;
+       rctx->context.delete_vertex_elements_state = r600_delete_vertex_elements;
+       rctx->context.delete_vs_state = r600_delete_vs_state;
        rctx->context.set_blend_color = r600_set_blend_color;
        rctx->context.set_constant_buffer = r600_set_constant_buffer;
        rctx->context.set_sample_mask = r600_set_sample_mask;