From 1574611faf9d9106cf167d277238b8c2662beabb Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 8 Nov 2007 16:36:00 -0700 Subject: Fix minor logic error in get_queued_prim() which caused flushing when there was still room in the prim queue. --- src/mesa/pipe/draw/draw_prim.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/mesa/pipe/draw/draw_prim.c index 94f6df56df6..baae6e98c54 100644 --- a/src/mesa/pipe/draw/draw_prim.c +++ b/src/mesa/pipe/draw/draw_prim.c @@ -60,6 +60,10 @@ static void draw_prim_queue_flush( struct draw_context *draw ) struct draw_stage *first = draw->pipeline.first; unsigned i; + if (0) + printf("Flushing with %d prims, %d verts\n", + draw->pq.queue_nr, draw->vs.queue_nr); + /* Make sure all vertices are available: */ if (draw->vs.queue_nr) @@ -137,11 +141,13 @@ static struct prim_header *get_queued_prim( struct draw_context *draw, // fprintf(stderr, "v"); draw_do_flush( draw, DRAW_FLUSH_VERTEX_CACHE_INVALIDATE ); } - else if (draw->pq.queue_nr + 1 >= PRIM_QUEUE_LENGTH) { + else if (draw->pq.queue_nr == PRIM_QUEUE_LENGTH) { // fprintf(stderr, "p"); draw_do_flush( draw, DRAW_FLUSH_PRIM_QUEUE ); } + assert(draw->pq.queue_nr < PRIM_QUEUE_LENGTH); + return &draw->pq.queue[draw->pq.queue_nr++]; } -- cgit v1.2.3