diff options
author | Zack Rusin <[email protected]> | 2013-08-08 15:44:10 -0400 |
---|---|---|
committer | Zack Rusin <[email protected]> | 2013-08-08 20:54:25 -0400 |
commit | 662a4d4a120cb0a07023f00e3c5e4a0809428a53 (patch) | |
tree | ad0d0a704411cdccb2a81ea0599209bb350f8077 /src/gallium/auxiliary/draw/draw_pipe.c | |
parent | 1d425c4c6df2affd3b36b98e28357c59f7f02f58 (diff) |
draw: rewrite primitive assembler
We can't be injecting the primitive id's in the pipeline because
by that time the primitives have already been decomposed. To
properly number the primitives we need to handle the adjacency
primitives by hand. This patch moves the prim id injection into
the original primitive assembler and completely removes the
useless pipeline stage.
Signed-off-by: Zack Rusin <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pipe.c')
-rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe.c b/src/gallium/auxiliary/draw/draw_pipe.c index 81402997f82..f1ee6cb1b0a 100644 --- a/src/gallium/auxiliary/draw/draw_pipe.c +++ b/src/gallium/auxiliary/draw/draw_pipe.c @@ -49,7 +49,6 @@ boolean draw_pipeline_init( struct draw_context *draw ) draw->pipeline.clip = draw_clip_stage( draw ); draw->pipeline.flatshade = draw_flatshade_stage( draw ); draw->pipeline.cull = draw_cull_stage( draw ); - draw->pipeline.ia = draw_ia_stage( draw ); draw->pipeline.validate = draw_validate_stage( draw ); draw->pipeline.first = draw->pipeline.validate; @@ -62,7 +61,6 @@ boolean draw_pipeline_init( struct draw_context *draw ) !draw->pipeline.clip || !draw->pipeline.flatshade || !draw->pipeline.cull || - !draw->pipeline.ia || !draw->pipeline.validate) return FALSE; @@ -97,8 +95,6 @@ void draw_pipeline_destroy( struct draw_context *draw ) draw->pipeline.flatshade->destroy( draw->pipeline.flatshade ); if (draw->pipeline.cull) draw->pipeline.cull->destroy( draw->pipeline.cull ); - if (draw->pipeline.ia) - draw->pipeline.ia->destroy( draw->pipeline.ia ); if (draw->pipeline.validate) draw->pipeline.validate->destroy( draw->pipeline.validate ); if (draw->pipeline.aaline) |