From d8782db3a48205f71c03feaf7ddfb092b8a523b2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 2 Apr 2025 14:39:29 +1100 Subject: [PATCH] glsl: fix regression in ubo cloning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes KHR-GL46.layout_binding.block_layout_binding_block_VertexShader with radeonsi. Fixes: 2b2132d2acd1 ("nir: fix uniform cloning helper") Reviewed-by: Marek Olšák Part-of: --- src/amd/ci/radeonsi-vangogh-fails.txt | 5 ----- src/compiler/nir/nir_linking_helpers.c | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/amd/ci/radeonsi-vangogh-fails.txt b/src/amd/ci/radeonsi-vangogh-fails.txt index d0fe91b8681..3ce61f84585 100644 --- a/src/amd/ci/radeonsi-vangogh-fails.txt +++ b/src/amd/ci/radeonsi-vangogh-fails.txt @@ -685,8 +685,3 @@ KHR-GL46.sparse_texture2_tests.StandardPageSizesTestCase_texture_1d_array_r32ui, KHR-GL46.sparse_texture2_tests.SparseTexture2Allocation_texture_2d_multisample_r16_snorm,Fail KHR-GL46.sparse_texture2_tests.UncommittedRegionsAccess_texture_2d_array_rg16f,Fail KHR-GL46.shader_image_load_store.basic-allTargets-atomic,Fail - -# some point around 2025-03-27, after the fd.o infrastructure move -KHR-GLES31.core.layout_binding.block_layout_binding_block_VertexShader,Fail - -KHR-GL46.layout_binding.block_layout_binding_block_VertexShader,Fail diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index 835f5290c13..af6069c98ab 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -1172,8 +1172,9 @@ nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform, bool spirv) if ((spirv && uniform->data.mode & nir_var_mem_ubo && v->data.binding == uniform->data.binding) || (!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)))) { + (!strcmp(uniform->name, v->name) && + uniform->data.explicit_binding == v->data.explicit_binding && + uniform->data.binding == v->data.binding))) { new_var = v; break; }