[Mesa-dev] [PATCH 1/6] i965: Fix missing CACHE_NEW_WM_PROG in 3DSTATE_PS_EXTRA.

[Jordan Justen]

Series Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

On 2014-11-24 22:03:10, Kenneth Graunke wrote:
> 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 <kenneth at whitecape.org>
> ---
>  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 3d3df19..7e3d78b 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.1.3
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev