Mesa (master): radv: brown-paper bag for a forgotten else.

Dave Airlie airlied at kemper.freedesktop.org
Mon Nov 28 06:23:21 UTC 2016


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 28 16:22:05 2016 +1000

radv: brown-paper bag for a forgotten else.

This fixes the fix:
radv/ac/llvm: fix regression with shadow samplers fix

Signed-off-by: Dave Airlie <airlied at redhat.com>
Cc: "13.0" <mesa-stable at lists.freedesktop.org>

---

 src/amd/common/ac_nir_to_llvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 16e30ef..f623cc0 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3629,7 +3629,7 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr)
 
 	if (instr->op == nir_texop_query_levels)
 		result = LLVMBuildExtractElement(ctx->builder, result, LLVMConstInt(ctx->i32, 3, false), "");
-	if (instr->is_shadow && instr->op != nir_texop_txs && instr->op != nir_texop_lod)
+	else if (instr->is_shadow && instr->op != nir_texop_txs && instr->op != nir_texop_lod)
 		result = LLVMBuildExtractElement(ctx->builder, result, ctx->i32zero, "");
 	else if (instr->op == nir_texop_txs &&
 		 instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&




More information about the mesa-commit mailing list