From: Jonathan Marek <jonathan@marek.ca>
Date: Mon, 7 Oct 2019 02:26:49 +0000 (-0400)
Subject: turnip: use nir_assign_io_var_locations instead of nir_assign_var_locations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=571b2611b3e2e1e8cc872ccddd036b9f8c943f55;p=mesa.git

turnip: use nir_assign_io_var_locations instead of nir_assign_var_locations

Variables with same location should use the same driver_location.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
---

diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index 755cde4def6..7a05a115269 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -378,12 +378,8 @@ tu_shader_create(struct tu_device *dev,
       break;
    }
 
-   nir_assign_var_locations(&nir->inputs, &nir->num_inputs,
-                            ir3_glsl_type_size);
-   nir_assign_var_locations(&nir->outputs, &nir->num_outputs,
-                            ir3_glsl_type_size);
-   nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms,
-                            ir3_glsl_type_size);
+   nir_assign_io_var_locations(&nir->inputs, &nir->num_inputs, stage);
+   nir_assign_io_var_locations(&nir->outputs, &nir->num_outputs, stage);
 
    NIR_PASS_V(nir, nir_lower_system_values);
    NIR_PASS_V(nir, nir_lower_frexp);