summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-09-25 14:19:18 -0600
committerBrian Paul <brianp@vmware.com>2010-09-25 14:25:40 -0600
commit1e35f6472df3341aca4d62eb3a3210603701c285 (patch)
tree2134666065654349c7171964a7c5ab66bb4057aa /src
parent63a5b7d7cc92bd7b670e02225f355ed2f8341022 (diff)
softpipe: minor asst. clean-ups
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/softpipe/sp_context.c5
-rw-r--r--src/gallium/drivers/softpipe/sp_state.h18
2 files changed, 11 insertions, 12 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 36aa8546ef..b5d30bc6fc 100644
--- 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 a7dcde28a8..525bf23734 100644
--- 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);