From cddf96529c267fe5ba73a833597a3750a973741b Mon Sep 17 00:00:00 2001 From: daenzer Date: Tue, 12 Feb 2013 12:11:23 +0000 Subject: R600: Fix regression with shadow array sampler on pre-SI GPUs. '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. I will follow up with some lit tests which would have caught the regression. NOTE: This is a candidate for the Mesa stable branch. Tested-by: Vincent Lejeune Reviewed-by: Tom Stellard git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174963 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit c276b1671d13def6dd142a76f49ec51dd6eaef6f) --- 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 d307ed2874a..1069570e058 100644 --- a/lib/Target/R600/R600Instructions.td +++ b/lib/Target/R600/R600Instructions.td @@ -399,7 +399,7 @@ class R600_TEX inst, string opName, list 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); }] >; -- cgit v1.2.3