commit 0a90dab6b49e76c113d5524299880827a229917f
author Samuel Pitoiset <samuel.pitoiset@gmail.com> Mon Oct 05 15:36:27 2020 +0200
committer Samuel Pitoiset <samuel.pitoiset@gmail.com> Mon Oct 12 08:33:57 2020 +0200
tree 4bc3ef7a1f4aecd1220e1d41680f9d38ff218e08
parent 181d5f59b8d967a16e432b7733252c7be33bb8a9

radv/llvm: stop assigning driver_location in NIR->LLVM

It's already assigned just after NIR linking shaders.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7010>

src/amd/llvm/ac_nir_to_llvm.c

diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index 89e4938..7a4f6ba 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -4687,7 +4687,7 @@
                                   struct nir_shader *nir, struct nir_variable *variable,
                                   gl_shader_stage stage)
 {
-   unsigned output_loc = variable->data.driver_location / 4;
+   unsigned output_loc = variable->data.driver_location;
    unsigned attrib_count = glsl_count_attribute_slots(variable->type, false);
 
    /* tess ctrl has it's own load/store paths for outputs */

src/amd/vulkan/radv_nir_to_llvm.c

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 580f71b..5837450 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1338,8 +1338,6 @@
 	unsigned attrib_count = glsl_count_attribute_slots(variable->type, false);
 	uint64_t mask_attribs;
 
-	variable->data.driver_location = idx * 4;
-
 	/* tess ctrl has it's own load/store paths for outputs */
 	if (stage == MESA_SHADER_TESS_CTRL)
 		return;