From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 8 Nov 2011 19:32:52 +0000 (-0800)
Subject: i965: Remove BRW_NEW_NR_VS_SURFACES dirty bit from brw_vs_surfaces.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1d86dc55c852815e8b32c264b8c469fab0ca745;p=mesa.git

i965: Remove BRW_NEW_NR_VS_SURFACES dirty bit from brw_vs_surfaces.

brw_vs_surfaces _produces_ the BRW_NEW_NR_VS_SURFACES dirty bit, so it
makes no sense for it to subscribe to it.

Fixes an assertion failure in many piglit tests when INTEL_DEBUG is set:
  brw_state_upload.c:484: void brw_upload_state(struct brw_context *):
  Assertion `!check_state(&examined, &generated)' failed.

One such piglit test is vs-uniform-array-mat2-col-rd.shader_test.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
index 8c63db8a89b..5f94bda9158 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
@@ -182,7 +182,6 @@ const struct brw_tracked_state brw_vs_surfaces = {
    .dirty = {
       .mesa = 0,
       .brw = (BRW_NEW_VS_CONSTBUF |
-	      BRW_NEW_NR_VS_SURFACES |
 	      BRW_NEW_BATCH),
       .cache = 0
    },