From 53f715fafb9af1043931b559647f400bd2cbd5e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 10 Apr 2019 10:48:37 -0400 Subject: [PATCH] Revert "glsl: fix shader_storage_blocks_write_access for SSBO block arrays" This reverts commit b7ca074cc0df6101c428b2dfa53a59a0c6620af2. It broke a lot of tests. --- src/compiler/glsl/link_uniforms.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index bbd71593948..ef124111991 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -544,12 +544,8 @@ public: assert(buffer_block_index != -1); if (var->is_in_shader_storage_block() && - !var->data.memory_read_only) { - shader_storage_blocks_write_access |= - u_bit_consecutive(buffer_block_index, - var->type->is_array() ? - var->type->array_size() : 1); - } + !var->data.memory_read_only) + shader_storage_blocks_write_access |= 1 << buffer_block_index; /* Uniform blocks that were specified with an instance name must be * handled a little bit differently. The name of the variable is the -- 2.30.2