From 52bdb043af952691b560118ca99e341527560e13 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 15 Feb 2019 14:14:03 +0100 Subject: [PATCH] radv: fix invalid element type when filling vertex input default values The elements added into a vector should have the same type as the first one, otherwise this hits an assertion in LLVM. Fixes: 4b3549c0846 ("radv: reduce the number of loaded channels for vertex input fetches") reported-by: Philip Rebohle Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_nir_to_llvm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index b4b09c9fed6..ec11f6e729e 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -2089,8 +2089,10 @@ radv_fixup_vertex_input_fetches(struct radv_shader_context *ctx, elemtype = LLVMTypeOf(value); } - for (unsigned i = num_channels; i < 4; i++) + for (unsigned i = num_channels; i < 4; i++) { chan[i] = i == 3 ? one : zero; + chan[i] = ac_to_float(&ctx->ac, chan[i]); + } return ac_build_gather_values(&ctx->ac, chan, 4); } -- 2.30.2