Module: Mesa Branch: master Commit: 680d202d49d2f2f67921940cc8b44bcb40b04d2a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=680d202d49d2f2f67921940cc8b44bcb40b04d2a
Author: Eric Anholt <e...@anholt.net> Date: Thu May 1 13:49:57 2014 -0700 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 <kenn...@whitecape.org> --- src/mesa/drivers/dri/i965/gen6_vs_state.c | 2 +- src/mesa/drivers/dri/i965/gen6_wm_state.c | 3 +-- 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 0af87d1..25f55c4 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 742a52e..3f5dd29 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, }; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit