From 6a1c1fd503a76438a98ce6eb60be00c1a3bd0992 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 8 Nov 2014 02:06:11 -0800 Subject: [PATCH] i965: Fix missing CACHE_NEW_WM_PROG in 3DSTATE_PS_EXTRA. brw->wm.prog_data is covered by CACHE_NEW_WM_PROG, not BRW_NEW_FRAGMENT_PROGRAM. So, we should listen to it. However, I believe that BRW_NEW_FRAGMENT_PROGRAM is sufficient to cover all the necessary cases - CACHE_NEW_WM_PROG happens in a subset of cases. So, the code being wrong shouldn't have triggered bugs. Signed-off-by: Kenneth Graunke Reviewed-by: Jordan Justen --- src/mesa/drivers/dri/i965/gen8_ps_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c b/src/mesa/drivers/dri/i965/gen8_ps_state.c index 3d3df19916a..7e3d78b6348 100644 --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c @@ -41,7 +41,7 @@ upload_ps_extra(struct brw_context *brw) if (fp->program.UsesKill) dw1 |= GEN8_PSX_KILL_ENABLE; - /* BRW_NEW_FRAGMENT_PROGRAM */ + /* CACHE_NEW_WM_PROG */ if (brw->wm.prog_data->num_varying_inputs != 0) dw1 |= GEN8_PSX_ATTRIBUTE_ENABLE; @@ -87,7 +87,7 @@ const struct brw_tracked_state gen8_ps_extra = { .dirty = { .mesa = _NEW_MULTISAMPLE, .brw = BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_NUM_SAMPLES, - .cache = 0, + .cache = CACHE_NEW_WM_PROG, }, .emit = upload_ps_extra, }; -- 2.30.2