diff options
| author | Timothy Arceri <[email protected]> | 2016-11-05 08:55:57 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:41 +1100 |
| commit | 0e7eec1ab5f27ced1aa4b2d77c2c63512d299694 (patch) | |
| tree | 1cf0ae90e08fd5c0f177a773a62a74c39545223d /src/mesa/main | |
| parent | b792c3897927c1d89968bc0040faef02ec976184 (diff) | |
st/mesa/glsl/i965: move per stage UniformBlocks to gl_program
This will help allow us to store pointers to gl_program structs in the
CurrentProgram array resulting in a bunch of code simplifications.
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 9c1bbd5b40a..308af2d3a75 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1999,6 +1999,8 @@ struct gl_program */ GLenum ImageAccess[MAX_IMAGE_UNIFORMS]; + struct gl_uniform_block **UniformBlocks; + union { struct { /** @@ -2382,8 +2384,6 @@ struct gl_linked_shader */ unsigned num_combined_uniform_components; - struct gl_uniform_block **UniformBlocks; - unsigned NumShaderStorageBlocks; struct gl_uniform_block **ShaderStorageBlocks; |