summaryrefslogtreecommitdiffstats
path: root/src/glsl/glsl_parser_extras.h
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-06-22 13:36:35 -0700
committerEric Anholt <[email protected]>2012-07-31 12:06:20 -0700
commit551bdf25bc4e57bea51c54da7e31c44c507e6c9f (patch)
tree30fe843355b1f850c0ce0772b605b65f1e03dd46 /src/glsl/glsl_parser_extras.h
parent7b77c64254109ff1d59a8937f8f15216c10c8cb7 (diff)
glsl: Add support for default layout qualifiers for uniforms.
I ended up having to add rallocing of the ast_type_qualifier in order to avoid pulling in ast.h for glsl_parser_extras.h, because I wanted to track an ast_type_qualifier in the state. Fixes piglit ARB_uniform_buffer_object/row-major. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser_extras.h')
-rw-r--r--src/glsl/glsl_parser_extras.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index bdb5b677cdf..c0a96c730c9 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -92,6 +92,13 @@ struct _mesa_glsl_parse_state {
enum _mesa_glsl_parser_targets target;
/**
+ * Default uniform layout qualifiers tracked during parsing.
+ * Currently affects uniform blocks and uniform buffer variables in
+ * those blocks.
+ */
+ class ast_type_qualifier *default_uniform_qualifier;
+
+ /**
* Printable list of GLSL versions supported by the current context
*
* \note