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 8c63db8a89b273464e79b9ce4a0d09bfc9385f01..5f94bda9158bac14166864324fad644682f0084b 100644 (file)
--- 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
    },