[Mesa-dev] [PATCH] r600: fix copy/paste bug for sampleMaskIn workaround

[Eric Engestrom]

On Monday, 2018-06-18 13:07:12 +0200, Roland Scheidegger wrote:
> Am 18.06.2018 um 12:43 schrieb Eric Engestrom:
> > On Friday, 2018-06-15 23:38:58 +0200, sroland at vmware.com wrote:
> >> From: Roland Scheidegger <sroland at vmware.com>
> >>
> >> The sampleMaskIn workaround (b936f4d1ca0d2ab1e828ff6a6e617f12469687fa)
> >> tries to figure out if the shader is running at per-sample frequency, but
> >> there's a typo bug so it will only recognize per-sample linar inputs,
> >> not per-sample perspective ones.
> >>
> >> Spotted by Eric Engestrom <eric.engestrom at intel.com>
> > 
> > Fixes: b936f4d1ca0d2ab1e828a "r600: partly fix sampleMaskIn value"
> Alright, albeit it's hardly a critical issue (and, before that patch, it
> was just always wrong anyway and there weren't really bugs associated to
> it...).

Sure, it's your call anyway.

> 
> Roland
> 
> 
> > 
> > (so that it goes on the stable branch as well)
> > 
> >> ---
> >>  src/gallium/drivers/r600/r600_shader.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
> >> index c9f2fa6485..c466a48262 100644
> >> --- a/src/gallium/drivers/r600/r600_shader.c
> >> +++ b/src/gallium/drivers/r600/r600_shader.c
> >> @@ -1247,7 +1247,7 @@ static int allocate_system_value_inputs(struct r600_shader_ctx *ctx, int gpr_off
> >>  	tgsi_parse_free(&parse);
> >>  
> >>  	if (ctx->info.reads_samplemask &&
> >> -	    (ctx->info.uses_linear_sample || ctx->info.uses_linear_sample)) {
> >> +	    (ctx->info.uses_linear_sample || ctx->info.uses_persp_sample)) {
> >>  		inputs[1].enabled = true;
> >>  	}
> >>  
> >> -- 
> >> 2.12.3
> >>
>