summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-02-19 12:24:32 -0700
committerIan Romanick <ian.d.romanick@intel.com>2013-03-05 14:57:09 -0800
commit6bc298a5b0f90a3ebb31a85c2cba5852d7fac4e0 (patch)
treeded1d09a259176b56e0f3f1754ea47523eaf7fa3
parentb382f1dbeb569c9c44bf6148303f27fc5cb9f3fd (diff)
st/mesa: fix trimming of GL_QUAD_STRIP
We sometimes convert GL_QUAD_STRIP prims into GL_TRIANGLE_STRIP, but that changes the results of the u_trim_pipe_prim() call. We need to pass the original primitive type to the trim function. Note that OpenGL's GL_x prim type values match Gallium's PIPE_PRIM_x values. Fixes a failure in the new piglit degenerate-prims test. Note: This is a candidate for the stable branches. Reviewed-by: José Fonseca <jfonseca@vmware.com> (cherry picked from commit 8589cc41b36b89bc80ad6a4f671e47f81a89d556)
-rw-r--r--src/mesa/state_tracker/st_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index de62264a16c..bff8d9b3143 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -283,7 +283,7 @@ st_draw_vbo(struct gl_context *ctx,
/* don't trim, restarts might be inside index list */
cso_draw_vbo(st->cso_context, &info);
}
- else if (u_trim_pipe_prim(info.mode, &info.count))
+ else if (u_trim_pipe_prim(prims[i].mode, &info.count))
cso_draw_vbo(st->cso_context, &info);
}