Revert "glsl: fix shader_storage_blocks_write_access for SSBO block arrays"
authorMarek Olšák <marek.olsak@amd.com>
Wed, 10 Apr 2019 14:48:37 +0000 (10:48 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 10 Apr 2019 14:48:56 +0000 (10:48 -0400)
This reverts commit b7ca074cc0df6101c428b2dfa53a59a0c6620af2.

It broke a lot of tests.

src/compiler/glsl/link_uniforms.cpp

index bbd71593948002ad86bad2078015c8f08cf7f8e0..ef1241119912513803aa27bb374f69c15f83f00e 100644 (file)
@@ -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