diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-01 08:02:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-01 08:02:35 +0200 |
| commit | 49838240b7d4cff1ffed1bd91e495f6919061f90 (patch) | |
| tree | 70bd36783cafbf991721b06134bafdd360ccbe06 /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | bd27b3d008b0abf9ae2edcb127302728808533e4 (diff) | |
| download | vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.tar.gz vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.tar.bz2 vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.zip | |
git mesa update 1 Aug 2012
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index fc5d11cb9..c0a96c730 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/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 @@ -122,23 +129,6 @@ struct _mesa_glsl_parse_state { /* ARB_draw_buffers */ unsigned MaxDrawBuffers; - - /** - * Set of GLSL versions supported by the current context - * - * Knowing that version X is supported doesn't mean that versions before - * X are also supported. Version 1.00 is only supported in an ES2 - * context or when GL_ARB_ES2_compatibility is supported. In an OpenGL - * 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not - * supported. - */ - /*@{*/ - unsigned GLSL_100ES:1; - unsigned GLSL_110:1; - unsigned GLSL_120:1; - unsigned GLSL_130:1; - unsigned GLSL_140:1; - /*@}*/ } Const; /** |