summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-05-01 13:49:57 -0700
committerEric Anholt <[email protected]>2014-05-02 17:01:40 -0700
commit680d202d49d2f2f67921940cc8b44bcb40b04d2a (patch)
tree7db200479afc23de6f5ad57f832d8d7bd19ce659 /src
parent02a34497581b768588db334fe294a43134d6fb82 (diff)
i965/gen6: Don't update unit state when samplers change.
There's no remaining dependency between these two packets that I can find. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/gen6_vs_state.c2
-rw-r--r--src/mesa/drivers/dri/i965/gen6_wm_state.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 0af87d1f4df..25f55c47d9e 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -218,7 +218,7 @@ const struct brw_tracked_state gen6_vs_state = {
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_BATCH |
BRW_NEW_PUSH_CONSTANT_ALLOCATION),
- .cache = CACHE_NEW_VS_PROG | CACHE_NEW_SAMPLER
+ .cache = CACHE_NEW_VS_PROG
},
.emit = upload_vs_state,
};
diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c
index 742a52e8f9d..3f5dd29487f 100644
--- a/src/mesa/drivers/dri/i965/gen6_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c
@@ -330,8 +330,7 @@ const struct brw_tracked_state gen6_wm_state = {
.brw = (BRW_NEW_FRAGMENT_PROGRAM |
BRW_NEW_BATCH |
BRW_NEW_PUSH_CONSTANT_ALLOCATION),
- .cache = (CACHE_NEW_SAMPLER |
- CACHE_NEW_WM_PROG)
+ .cache = (CACHE_NEW_WM_PROG)
},
.emit = upload_wm_state,
};