summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2016-10-25 06:53:03 +1000
committerDave Airlie <[email protected]>2016-10-27 11:42:03 +1000
commitd548fa882b865b8e5052954b872e392312c38ab8 (patch)
treee9912cbbda035fca5fced76c0f495e10c7bc9695
parent5c73ecaac487eba36e15f22be2e9396c4a0ffe46 (diff)
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 <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Cc: "13.0" <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--src/amd/common/ac_nir_to_llvm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index b602c5e61c5..c12c506a892 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) {