From de5de2ec6038132bb556e4c812ef6c7456a18ab2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 24 Mar 2025 15:20:55 +1100 Subject: [PATCH] nir: fix uniform cloning helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit glsl allows for ubos to have the same name but different bindings. Reviewed-by: Alejandro Piñeiro Fixes: b47b8d16d947 ("nir: expose reusable linking helpers for cloning uniform loads") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12852 Part-of: (cherry picked from commit 2b2132d2acd1fc312de41813888b802aeda3a00a) --- .pick_status.json | 2 +- src/compiler/nir/nir_linking_helpers.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f42f061dcc9..018e41f8228 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4034,7 +4034,7 @@ "description": "nir: fix uniform cloning helper", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b47b8d16d94792cc4694f350b4bad212e357e9f0", "notes": null diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index 8874540b73b..73bc317ad4b 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -1171,7 +1171,9 @@ nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform, bool spirv) nir_foreach_variable_with_modes(v, nir, uniform->data.mode) { if ((spirv && uniform->data.mode & nir_var_mem_ubo && v->data.binding == uniform->data.binding) || - (!spirv && !strcmp(uniform->name, v->name))) { + (!spirv && + ((!strcmp(uniform->name, v->name) && !uniform->data.explicit_binding && !v->data.explicit_binding) || + (uniform->data.explicit_binding && v->data.explicit_binding && v->data.binding == uniform->data.binding)))) { new_var = v; break; }