From d548fa882b865b8e5052954b872e392312c38ab8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 25 Oct 2016 06:53:03 +1000 Subject: [PATCH] radv/ac/llvm: trim texture return values The intrinsic engine asserts in llvm due to this, as we put a vec4 into a vec1, and the next instruction isn't expecting it. So trim the vector at the end before inserting it. Reported-by: Christoph Haag Reviewed-by: Bas Nieuwenhuizen Cc: "13.0" Signed-off-by: Dave Airlie --- src/amd/common/ac_nir_to_llvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index b602c5e..c12c506 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3520,7 +3520,8 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr) LLVMValueRef z = LLVMBuildExtractElement(ctx->builder, result, two, ""); z = LLVMBuildSDiv(ctx->builder, z, six, ""); result = LLVMBuildInsertElement(ctx->builder, result, z, two, ""); - } + } else if (instr->dest.ssa.num_components != 4) + result = trim_vector(ctx, result, instr->dest.ssa.num_components); write_result: if (result) { -- 2.7.4