Attachment 47693 Details for Bug 31590 – patch 2 of 2 to fix vbo/display list bugs

[patch] patch 2 of 2 to fix vbo/display list bugs

0002-vbo-remove-node-count-0-test-in-vbo_save_playback_ve.patch (text/plain), 2.36 KB, created by Brian Paul on 2011-06-07 15:05:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2011-06-07 15:05:12 UTC

Size: 2.36 KB

patch

obsolete

>From c27baee5e0fd93b34b9d10ef7c4ce09831dc71ff Mon Sep 17 00:00:00 2001
>From: Brian Paul <brianp@vmware.com>
>Date: Tue, 7 Jun 2011 14:41:10 -0600
>Subject: [PATCH 2/2] vbo: remove node->count > 0 test in vbo_save_playback_vertex_list()
>
>See piglit dlist-fdo31590.c test and
>http://bugs.freedesktop.org/show_bug.cgi?id=31590
>
>In this case we had node->prim_count=1 but node->count==0 because the
>display list started with glBegin() but had no vertices.  The call to
>glEvalCoord1f() triggered the DO_FALLBACK() path.  When replaying the
>display list, the old condition basically no-op'd the call to
>vbo_save_playback_vertex_list call().  That led to the invalid operation
>error being raised in glEnd().
>
>NOTE: This is a candidate for the 7.10 branch.
>---
> src/mesa/vbo/vbo_save_draw.c |   20 +++++++++++---------
> 1 files changed, 11 insertions(+), 9 deletions(-)
>
>diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
>index ca4cff3..a37af73 100644
>--- a/src/mesa/vbo/vbo_save_draw.c
>+++ b/src/mesa/vbo/vbo_save_draw.c
>@@ -249,7 +249,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
> 
>    FLUSH_CURRENT(ctx, 0);
> 
>-   if (node->prim_count > 0 && node->count > 0) {
>+   if (node->prim_count > 0) {
> 
>       if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END &&
> 	  node->prim[0].begin) {
>@@ -289,14 +289,16 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
>       if (ctx->NewState)
> 	 _mesa_update_state( ctx );
> 
>-      vbo_context(ctx)->draw_prims(ctx, 
>-                                   save->inputs, 
>-                                   node->prim, 
>-                                   node->prim_count,
>-                                   NULL,
>-                                   GL_TRUE,
>-                                   0,	/* Node is a VBO, so this is ok */
>-                                   node->count - 1);
>+      if (node->count > 0) {
>+         vbo_context(ctx)->draw_prims(ctx, 
>+                                      save->inputs, 
>+                                      node->prim, 
>+                                      node->prim_count,
>+                                      NULL,
>+                                      GL_TRUE,
>+                                      0,    /* Node is a VBO, so this is ok */
>+                                      node->count - 1);
>+      }
>    }
> 
>    /* Copy to current?
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 31590: 40357 | 40654 | 47692 | 47693

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.