diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-01 08:04:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-01 08:04:11 +0200 |
| commit | 949282a6e80256ab56a1e95e484886873c7c0e4a (patch) | |
| tree | d1102c4b3abd9dc93a2bf8808e498d10ba095390 /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 83da3ad0287bc51cd16ee6911fe73dc98ebe000b (diff) | |
| parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
| download | vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.tar.gz vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.tar.bz2 vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.zip | |
Merge remote-tracking branch 'origin/released'
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 cf6dfbe3b..5fc243ffe 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -96,6 +96,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 @@ -126,23 +133,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; /** |