diff options
Diffstat (limited to 'src/mesa/pipe/softpipe')
-rw-r--r-- | src/mesa/pipe/softpipe/sp_context.c | 4 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_prim_setup.c | 27 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_prim_setup.h | 21 |
3 files changed, 28 insertions, 24 deletions
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c index d3aea3698a..9511254a96 100644 --- a/src/mesa/pipe/softpipe/sp_context.c +++ b/src/mesa/pipe/softpipe/sp_context.c @@ -93,10 +93,10 @@ struct pipe_context *softpipe_create( void ) softpipe->quad.output = sp_quad_output_stage(softpipe); /* - * Create drawing context and plug our render/setup stage into it. + * Create drawing context and plug our rendering stage into it. */ softpipe->draw = draw_create(); - draw_set_setup_stage(softpipe->draw, prim_setup(softpipe)); + draw_set_setup_stage(softpipe->draw, sp_draw_render_stage(softpipe)); /* * XXX we could plug GL selection/feedback into the drawing pipeline diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c index 5db05ecccb..e94ca139aa 100644 --- a/src/mesa/pipe/softpipe/sp_prim_setup.c +++ b/src/mesa/pipe/softpipe/sp_prim_setup.c @@ -127,14 +127,6 @@ static inline GLint block( GLint x ) -static void setup_begin( struct draw_stage *stage ) -{ - struct setup_stage *setup = setup_stage(stage); - - setup->quad.nr_attrs = setup->softpipe->nr_frag_attrs; -} - - /** * Run shader on a quad/block. */ @@ -928,15 +920,32 @@ setup_point(struct draw_stage *stage, struct prim_header *prim) +static void setup_begin( struct draw_stage *stage ) +{ + struct setup_stage *setup = setup_stage(stage); + + setup->quad.nr_attrs = setup->softpipe->nr_frag_attrs; + + /* + * XXX this is where we might map() the renderbuffers to begin + * s/w rendering. + */ +} + + static void setup_end( struct draw_stage *stage ) { + /* + * XXX this is where we might unmap() the renderbuffers after + * s/w rendering. + */ } /** * Create a new primitive setup/render stage. */ -struct draw_stage *prim_setup( struct softpipe_context *softpipe ) +struct draw_stage *sp_draw_render_stage( struct softpipe_context *softpipe ) { struct setup_stage *setup = CALLOC_STRUCT(setup_stage); diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.h b/src/mesa/pipe/softpipe/sp_prim_setup.h index be00b0182b..e5abefcd49 100644 --- a/src/mesa/pipe/softpipe/sp_prim_setup.h +++ b/src/mesa/pipe/softpipe/sp_prim_setup.h @@ -22,8 +22,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef S_TRI_H -#define S_TRI_H + +#ifndef SP_PRIM_SETUP_H +#define SP_PRIM_SETUP_H + /* Vertices are just an array of floats, with all the attributes * packed. We currently assume a layout like: @@ -43,7 +45,7 @@ #include "s_context.h" -extern struct draw_stage *prim_setup( struct softpipe_context *softpipe ); +extern struct draw_stage *sp_draw_render_stage( struct softpipe_context *softpipe ); #if 0 /* UNUSED? */ @@ -104,11 +106,6 @@ void tri_triangle( struct tri_context *tri, #ifdef SETUP_PRIVATE - - - - - GLboolean tri_setup( struct tri_context *tri, const struct vertex *v0, const struct vertex *v1, @@ -117,11 +114,9 @@ GLboolean tri_setup( struct tri_context *tri, void tri_rasterize( struct tri_context *tri ); void tri_rasterize_spans( struct tri_context *tri ); - - - +#endif #endif -#endif -#endif + +#endif /* SP_PRIM_SETUP_H */ |