From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 29 May 2013 14:57:34 +0000 (-0700)
Subject: st/mesa: Go back to using ctx->Array.RestartIndex, not _RestartIndex.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a41478e3f60d0d4c16cc22170866e561fd216834;p=mesa.git

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@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index a0cf2ca1d8f..a440ae2a8f8 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. */