From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 29 May 2013 15:29:26 +0000 (-0700)
Subject: mesa: Ignore fixed-index primitive restart in ArrayElement().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51c0ffacb24d1b4e48f8f53dc8e191b64fbd679a;p=mesa.git

mesa: Ignore fixed-index primitive restart in ArrayElement().

GL_PRIMITIVE_RESTART_FIXED_INDEX is only supposed to apply to
glDrawElements*.  This code is for legacy drawing paths and display
lists, so it shouldn't apply.

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/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index bd55f8e4322..8e581c8d9c6 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1666,7 +1666,7 @@ _ae_ArrayElement(GLint elt)
    /* If PrimitiveRestart is enabled and the index is the RestartIndex
     * then we call PrimitiveRestartNV and return.
     */
-   if (ctx->Array._PrimitiveRestart && (elt == ctx->Array._RestartIndex)) {
+   if (ctx->Array.PrimitiveRestart && (elt == ctx->Array.RestartIndex)) {
       CALL_PrimitiveRestartNV((struct _glapi_table *)disp, ());
       return;
    }