st/mesa/glsl/i965: move ShaderStorageBlocks to gl_program

Having it here rather than in gl_linked_shader allows us to simplify
the code.

Also it is error prone to depend on the gl_linked_shader for programs
in current use because a failed linking attempt will free infomation
about the current program. In i965 we could be trying to recompile
a shader variant but may have lost some required fields.

Reviewed-by: Lionel Landwerlin <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/compiler/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
index 02a97bd352e..bfaddac3add 100644
--- a/src/compiler/glsl/lower_ubo_reference.cpp
+++ b/src/compiler/glsl/lower_ubo_reference.cpp
@@ -290,7 +290,7 @@ lower_ubo_reference_visitor::setup_for_load_or_store(void *mem_ctx,
    struct gl_uniform_block **blocks;
    if (this->buffer_access_type != ubo_load_access) {
       num_blocks = shader->Program->info.num_ssbos;
-      blocks = shader->ShaderStorageBlocks;
+      blocks = shader->Program->sh.ShaderStorageBlocks;
    } else {
       num_blocks = shader->Program->info.num_ubos;
       blocks = shader->Program->sh.UniformBlocks;