Mesa (master): radv/ac/llvm: shadow samplers only return one value.

Dave Airlie airlied at kemper.freedesktop.org
Sun Nov 27 23:05:16 UTC 2016


Module: Mesa
Branch: master
Commit: b56b54cbf1d8e70c87a434da5350d11533e5fed8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b56b54cbf1d8e70c87a434da5350d11533e5fed8

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 25 07:47:13 2016 +1000

radv/ac/llvm: shadow samplers only return one value.

The intrinsic engine asserts in llvm due to this.

Reported-by: Christoph Haag <haagch+mesadev at frickel.club>
Cc: "13.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/common/ac_nir_to_llvm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 76d6d88..2108902 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3627,7 +3627,9 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr)
 
 	result = build_tex_intrinsic(ctx, instr, &tinfo);
 
-	if (instr->op == nir_texop_query_levels)
+	if (instr->is_shadow)
+		result = LLVMBuildExtractElement(ctx->builder, result, ctx->i32zero, "");
+	else if (instr->op == nir_texop_query_levels)
 		result = LLVMBuildExtractElement(ctx->builder, result, LLVMConstInt(ctx->i32, 3, false), "");
 	else if (instr->op == nir_texop_txs &&
 		 instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&




More information about the mesa-commit mailing list