i965: Remove BRW_WM_LOCK dirty bit, introduced to work around lack of relocs.

This was causing a prepare of wm state at every primitive emit.

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index e3904be977fbc3ca52d686bace1d46f0cecd7ca4..67bb2a94ba820d9f9039215335045b79f1879be6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -133,7 +133,6 @@ struct brw_context;
 #define BRW_NEW_PSP                     0x800
 #define BRW_NEW_METAOPS                 0x1000
 #define BRW_NEW_FENCE                   0x2000
-#define BRW_NEW_LOCK                    0x4000
 #define BRW_NEW_INDICES                        0x8000
 #define BRW_NEW_VERTICES               0x10000
 /**

diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 3a173d5266e62af6a73ac101693dd85d09159adf..5124535f2a6e158177caca809d62b76ba2877927 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -235,7 +235,6 @@ static struct dirty_bit_map brw_bits[] = {
    DEFINE_BIT(BRW_NEW_PSP),
    DEFINE_BIT(BRW_NEW_METAOPS),
    DEFINE_BIT(BRW_NEW_FENCE),
-   DEFINE_BIT(BRW_NEW_LOCK),
    DEFINE_BIT(BRW_NEW_INDICES),
    DEFINE_BIT(BRW_NEW_VERTICES),
    DEFINE_BIT(BRW_NEW_BATCH),

diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c
index 2d4c81274e6c05b9f85740e4616974936512e9c8..f7293ef4233d54c1ec21715f94e649243531397b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vtbl.c
+++ b/src/mesa/drivers/dri/i965/brw_vtbl.c
@@ -171,8 +171,6 @@ static void brw_note_unlock( struct intel_context *intel )
    struct brw_context *brw = brw_context(&intel->ctx);
 
    brw_state_cache_check_size(brw);
-
-   brw_context(&intel->ctx)->state.dirty.brw |= BRW_NEW_LOCK;
 }
 
 

diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index fd461618bc446b8ec1a3d97610027bfec27941b5..a640da5b45c0af22a0ec81a07598d2e32064a3da 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -280,8 +280,7 @@ const struct brw_tracked_state brw_wm_unit = {
               _NEW_COLOR),
 
       .brw = (BRW_NEW_FRAGMENT_PROGRAM | 
-             BRW_NEW_CURBE_OFFSETS |
-             BRW_NEW_LOCK),
+             BRW_NEW_CURBE_OFFSETS),
 
       .cache = (CACHE_NEW_SURFACE | 
                CACHE_NEW_WM_PROG |