From e6efb900e7a7601797b2e8263388fe72f6820e9b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 29 May 2013 08:31:54 -0700 Subject: [PATCH] mesa: Delete the ctx->Array._RestartIndex derived state. It's incorrect and isn't used any longer. v2: Actually flush vertices/flag _NEW_TRANSFORM on RestartIndex change. NOTE: This is a candidate for the 9.1 branch. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt Reviewed-by: Ian Romanick --- src/mesa/main/attrib.c | 1 - src/mesa/main/enable.c | 5 ----- src/mesa/main/mtypes.h | 4 +--- src/mesa/main/varray.c | 5 ++--- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index c118a94da28..249e88a4a35 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1399,7 +1399,6 @@ copy_array_attrib(struct gl_context *ctx, dest->PrimitiveRestartFixedIndex = src->PrimitiveRestartFixedIndex; dest->_PrimitiveRestart = src->_PrimitiveRestart; dest->RestartIndex = src->RestartIndex; - dest->_RestartIndex = src->_RestartIndex; /* skip NewState */ /* skip RebindArrays */ diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 016e432d960..fdde24e36fa 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -53,11 +53,6 @@ update_derived_primitive_restart_state(struct gl_context *ctx) { /* Update derived primitive restart state. */ - if (ctx->Array.PrimitiveRestart) - ctx->Array._RestartIndex = ctx->Array.RestartIndex; - else - ctx->Array._RestartIndex = ~0; - ctx->Array._PrimitiveRestart = ctx->Array.PrimitiveRestart || ctx->Array.PrimitiveRestartFixedIndex; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index e0e188606c5..882ebe14619 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1534,15 +1534,13 @@ struct gl_array_attrib * \name Primitive restart controls * * Primitive restart is enabled if either \c PrimitiveRestart or - * \c PrimitiveRestartFixedIndex is set. If \c PrimitiveRestart is set, - * then \c RestartIndex is used as the cut vertex. Otherwise ~0 is used. + * \c PrimitiveRestartFixedIndex is set. */ /*@{*/ GLboolean PrimitiveRestart; GLboolean PrimitiveRestartFixedIndex; GLboolean _PrimitiveRestart; GLuint RestartIndex; - GLuint _RestartIndex; /*@}*/ /* GL_ARB_vertex_buffer_object */ diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index dff00700430..db0945e3095 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1109,10 +1109,9 @@ _mesa_PrimitiveRestartIndex(GLuint index) return; } - ctx->Array.RestartIndex = index; - if (ctx->Array.PrimitiveRestart && ctx->Array._RestartIndex != index) { + if (ctx->Array.RestartIndex != index) { FLUSH_VERTICES(ctx, _NEW_TRANSFORM); - ctx->Array._RestartIndex = index; + ctx->Array.RestartIndex = index; } } -- 2.30.2