From f5bc127b2f140213a8ceb58c4ed2d9b9a4c0449c Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sat, 5 Nov 2016 10:10:02 +1100 Subject: 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 --- src/mesa/main/mtypes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index e4be2ea9a3a..0301eb57f8f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2000,6 +2000,7 @@ struct gl_program GLenum ImageAccess[MAX_IMAGE_UNIFORMS]; struct gl_uniform_block **UniformBlocks; + struct gl_uniform_block **ShaderStorageBlocks; union { struct { @@ -2384,8 +2385,6 @@ struct gl_linked_shader */ unsigned num_combined_uniform_components; - struct gl_uniform_block **ShaderStorageBlocks; - struct exec_list *ir; struct exec_list *packed_varyings; struct exec_list *fragdata_arrays; -- cgit v1.2.3