[Mesa-dev] [PATCH] R600: Fix regression with shadow array sampler on pre-SI GPUs.

[Tom Stellard]

On Mon, Feb 11, 2013 at 05:53:39PM +0100, Michel Dänzer wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
> 
> 'R600/SI: Use proper instructions for array/shadow samplers.' removed two
> cases from TEX_SHADOW. Vincent Lejeune reported on IRC that this broke some
> shadow array piglit tests with the r600g driver. Reinstating the removed
> cases should fix this, and still works with radeonsi as well.
> 
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

Don't forget to mark this as a candidate for the stable branch.

> ---
> 
> Vincent, can you confirm this fixes the regression?
> 
>  lib/Target/R600/R600Instructions.td | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/Target/R600/R600Instructions.td b/lib/Target/R600/R600Instructions.td
> index d307ed2..1069570 100644
> --- a/lib/Target/R600/R600Instructions.td
> +++ b/lib/Target/R600/R600Instructions.td
> @@ -399,7 +399,7 @@ class R600_TEX <bits<11> inst, string opName, list<dag> pattern,
>  def TEX_SHADOW : PatLeaf<
>    (imm),
>    [{uint32_t TType = (uint32_t)N->getZExtValue();
> -    return (TType >= 6 && TType <= 8) || TType == 13;
> +    return (TType >= 6 && TType <= 8) || (TType >= 11 && TType <= 13);
>    }]
>  >;
>  
> -- 
> 1.8.1.3
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev