From: Dave Airlie <airlied@redhat.com>
Date: Tue, 31 Oct 2017 01:29:54 +0000 (+1000)
Subject: ac/nir: for ubo load use correct num_components
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0084f4a42290ab54c185c9284a5670d4da4fc66e;p=mesa.git

ac/nir: for ubo load use correct num_components

I was hacking something stupid in doom, and hit an assert for the bitcast
following this, it definitely looks like this should be the number of 32-bit
components, not the instr level ones.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 38a65b9cd13..2ae656693fc 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -2467,7 +2467,7 @@ static LLVMValueRef visit_load_ubo_buffer(struct ac_nir_context *ctx,
 	}
 
 
-	ret = ac_build_gather_values(&ctx->ac, results, instr->num_components);
+	ret = ac_build_gather_values(&ctx->ac, results, num_components);
 	return LLVMBuildBitCast(ctx->ac.builder, ret,
 	                        get_def_type(ctx, &instr->dest.ssa), "");
 }