Mesa (10.4): st/mesa: fix GL_PRIMITIVE_RESTART_FIXED_INDEX

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 1b498cf5b7d1587bb80a1ba8c0a23967e0a82d43
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b498cf5b7d1587bb80a1ba8c0a23967e0a82d43

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Jan  4 15:43:47 2015 +0100

st/mesa: fix GL_PRIMITIVE_RESTART_FIXED_INDEX

Cc: 10.2 10.3 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit eaae92a349af1fd6641c4bdd4bfd1185b1b6fe3e)

---

 src/mesa/state_tracker/st_draw.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 64d6ef5..b6ccdd7 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -40,6 +40,7 @@
 #include "main/image.h"
 #include "main/bufferobj.h"
 #include "main/macros.h"
+#include "main/varray.h"
 
 #include "vbo/vbo.h"
 
@@ -234,7 +235,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 = _mesa_primitive_restart_index(ctx, ib->type);
    }
    else {
       /* Transform feedback drawing is always non-indexed. */