Mesa (master): st/mesa: Go back to using ctx->Array.RestartIndex, not _RestartIndex.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed May 29 21:20:56 UTC 2013


Module: Mesa
Branch: master
Commit: a41478e3f60d0d4c16cc22170866e561fd216834
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a41478e3f60d0d4c16cc22170866e561fd216834

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed May 29 07:57:34 2013 -0700

st/mesa: Go back to using ctx->Array.RestartIndex, not _RestartIndex.

The derived _RestartIndex field is an attempt to support both
GL_PRIMITIVE_RESTART and GL_PRIMITIVE_RESTART_FIXED_INDEX (part of ES
3.0).  Gallium drivers don't appear to support ES 3.0 yet, so they don't
need to use it.  Plus, it's broken and going to go away soon.

NOTE: This is a candidate for the 9.1 branch.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/state_tracker/st_draw.c |    2 +-
 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 a0cf2ca..a440ae2 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -244,7 +244,7 @@ st_draw_vbo(struct gl_context *ctx,
        * so we only set these fields for indexed drawing:
        */
       info.primitive_restart = ctx->Array._PrimitiveRestart;
-      info.restart_index = ctx->Array._RestartIndex;
+      info.restart_index = ctx->Array.RestartIndex;
    }
    else {
       /* Transform feedback drawing is always non-indexed. */




More information about the mesa-commit mailing list