commit e5536e4a78e5d9a0028951ea13dc0bf818d4c5a1
author Jason Ekstrand <jason@jlekstrand.net> Tue Jul 21 11:57:21 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Wed Jul 29 17:38:58 2020 +0000
tree 3c625cc0509704a097cc23f2ffc0de73e42c2fe3
parent a61be312e218231e2090ac6db4d7e1d5aca4c5d2

aco: Use nir_foreach_variable_with_modes to walk SSBOs

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5966>

src/amd/compiler/aco_instruction_selection_setup.cpp

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index f39f847..aae5967 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -327,8 +327,8 @@
    }
    ctx->buffer_resource_flags = std::vector<uint8_t>(resource_flag_count);
 
-   nir_foreach_variable(var, &impl->function->shader->uniforms) {
-      if (var->data.mode == nir_var_mem_ssbo && (var->data.access & ACCESS_RESTRICT)) {
+   nir_foreach_variable_with_modes(var, impl->function->shader, nir_var_mem_ssbo) {
+      if (var->data.access & ACCESS_RESTRICT) {
          uint32_t offset = ctx->resource_flag_offsets[var->data.descriptor_set];
          ctx->buffer_resource_flags[offset + var->data.binding] |= buffer_is_restrict;
       }