From 5f791df0d004291cf10fb54efa3b784a2dfd3ee2 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Sun, 15 Dec 2019 18:56:47 -0500 Subject: [PATCH] turnip: fix array/matrix varyings Signed-off-by: Jonathan Marek Reviewed-by: Eric Anholt Tested-by: Marge Bot Part-of: --- src/freedreno/vulkan/tu_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c index 13481b8d214..67374ac22cc 100644 --- a/src/freedreno/vulkan/tu_shader.c +++ b/src/freedreno/vulkan/tu_shader.c @@ -447,6 +447,8 @@ tu_shader_create(struct tu_device *dev, /* ir3 doesn't support indirect input/output */ NIR_PASS_V(nir, nir_lower_indirect_derefs, nir_var_shader_in | nir_var_shader_out); + NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false); + nir_assign_io_var_locations(&nir->inputs, &nir->num_inputs, stage); nir_assign_io_var_locations(&nir->outputs, &nir->num_outputs, stage); @@ -470,8 +472,6 @@ tu_shader_create(struct tu_device *dev, NIR_PASS_V(nir, ir3_nir_move_varying_inputs); } - NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false); - nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); /* num_uniforms only used by ir3 for size of ubo 0 (push constants) */ -- 2.30.2