diff options
| author | Timothy Arceri <[email protected]> | 2016-11-05 10:10:02 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:41 +1100 |
| commit | f5bc127b2f140213a8ceb58c4ed2d9b9a4c0449c (patch) | |
| tree | 135b5edd05c97dfb21803b56cc1e3352a14a8cb5 /src/compiler/glsl/link_uniforms.cpp | |
| parent | f62eb6c7eb22cd97c691ebdb5f25eb5fe8e9ed11 (diff) | |
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]>
Diffstat (limited to 'src/compiler/glsl/link_uniforms.cpp')
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index dba46771ec2..90eac5cc512 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -903,7 +903,8 @@ link_update_uniform_buffer_variables(struct gl_linked_shader *shader, unsigned num_blocks = var->data.mode == ir_var_uniform ? shader->Program->info.num_ubos : shader->Program->info.num_ssbos; struct gl_uniform_block **blks = var->data.mode == ir_var_uniform ? - shader->Program->sh.UniformBlocks : shader->ShaderStorageBlocks; + shader->Program->sh.UniformBlocks : + shader->Program->sh.ShaderStorageBlocks; if (var->is_interface_instance()) { const ir_array_refcount_entry *const entry = v.get_variable_entry(var); |