softpipe: minor asst. clean-ups

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 36aa8546efd4590f2a1cfd4f42bc508b9a868d15..b5d30bc6fc974b985e4b22ec142d00b4f88de730 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -230,10 +230,12 @@ softpipe_create_context( struct pipe_screen *screen,
    /* state setters */
    softpipe_init_blend_funcs(&softpipe->pipe);
    softpipe_init_clip_funcs(&softpipe->pipe);
+   softpipe_init_query_funcs( softpipe );
    softpipe_init_rasterizer_funcs(&softpipe->pipe);
    softpipe_init_sampler_funcs(&softpipe->pipe);
    softpipe_init_shader_funcs(&softpipe->pipe);
    softpipe_init_streamout_funcs(&softpipe->pipe);
+   softpipe_init_texture_funcs( &softpipe->pipe );
    softpipe_init_vertex_funcs(&softpipe->pipe);
 
    softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
@@ -246,9 +248,6 @@ softpipe_create_context( struct pipe_screen *screen,
 
    softpipe->pipe.is_resource_referenced = softpipe_is_resource_referenced;
 
-   softpipe_init_query_funcs( softpipe );
-   softpipe_init_texture_funcs( &softpipe->pipe );
-
    softpipe->pipe.render_condition = softpipe_render_condition;
 
    /*

diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index a7dcde28a89e2747f501e3579f7f22ba486a1ca8..525bf23734a193e29377d35bc1f82bf80ebeff23 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -128,27 +128,27 @@ void
 softpipe_init_rasterizer_funcs(struct pipe_context *pipe);
 
 void
-softpipe_init_streamout_funcs(struct pipe_context *pipe);
-
-
-void softpipe_set_framebuffer_state( struct pipe_context *,
-                                     const struct pipe_framebuffer_state * );
+softpipe_init_shader_funcs(struct pipe_context *pipe);
 
 void
-softpipe_init_shader_funcs(struct pipe_context *pipe);
+softpipe_init_streamout_funcs(struct pipe_context *pipe);
 
 void
 softpipe_init_vertex_funcs(struct pipe_context *pipe);
 
+void
+softpipe_set_framebuffer_state(struct pipe_context *,
+                               const struct pipe_framebuffer_state *);
 
-void softpipe_update_derived( struct softpipe_context *softpipe );
-
+void
+softpipe_update_derived( struct softpipe_context *softpipe );
 
 void
 softpipe_draw_vbo(struct pipe_context *pipe,
                   const struct pipe_draw_info *info);
 
-void softpipe_draw_stream_output(struct pipe_context *pipe, unsigned mode);
+void
+softpipe_draw_stream_output(struct pipe_context *pipe, unsigned mode);
 
 void
 softpipe_map_transfers(struct softpipe_context *sp);