st/mesa/glsl/i965: move per stage UniformBlocks to gl_program

[mesa.git] / src / mesa / main / mtypes.h

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9c1bbd5b40abca55f8fa4ade292d97b70d296e54..308af2d3a757a8f286e981889e739db4ac9fe899 100644 (file)
--- 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;