Mesa (master): i965: Use derived state for Haswell's 3DSTATE_VF packet.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sun Feb 10 16:55:19 2013 -0800

i965: Use derived state for Haswell's 3DSTATE_VF packet.

Otherwise, we fail to correctly handle GL_PRIMITIVE_RESTART_FIXED_INDEX.

Fixes gles3conform's primitive_restart_mode test.

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>

---

 src/mesa/drivers/dri/i965/brw_primitive_restart.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
index 8c7219d..e6902b4 100644
--- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
+++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
@@ -196,11 +196,11 @@ haswell_upload_cut_index(struct brw_context *brw)
       return;
 
    const unsigned cut_index_setting =
-      ctx->Array.PrimitiveRestart ? HSW_CUT_INDEX_ENABLE : 0;
+      ctx->Array._PrimitiveRestart ? HSW_CUT_INDEX_ENABLE : 0;
 
    BEGIN_BATCH(2);
    OUT_BATCH(_3DSTATE_VF << 16 | cut_index_setting | (2 - 2));
-   OUT_BATCH(ctx->Array.RestartIndex);
+   OUT_BATCH(ctx->Array._RestartIndex);
    ADVANCE_BATCH();
 }