diff options
author | marha <marha@users.sourceforge.net> | 2014-07-01 08:46:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-07-01 08:46:12 +0200 |
commit | cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8 (patch) | |
tree | 1103248fcbdd2cd7a9b6cf1d336da7b3f58d4e2b /mesalib/src/glsl/glsl_parser_extras.h | |
parent | fba3b6d1979c1d1ad0d56d46fc2d787f111c07fb (diff) | |
download | vcxsrv-cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8.tar.gz vcxsrv-cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8.tar.bz2 vcxsrv-cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8.zip |
fontconfig mesa pixman git update 1 July 2014
pixman commit 5a2edb3f2c2cfde6b25ac614e2004a9f78583d74
fontconfig commit dab60e4476ada4ad4639599ea24dd012d4a79584
mesa commit 1bfc0a11027449ae7ab7c28eb695f26de530eccf
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
-rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index aa4a114e4..a0af965fd 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -119,6 +119,19 @@ struct _mesa_glsl_parse_state { return check_version(130, 300, locp, "bit-wise operations are forbidden"); } + bool check_explicit_attrib_stream_allowed(YYLTYPE *locp) + { + if (!this->has_explicit_attrib_stream()) { + const char *const requirement = "GL_ARB_gpu_shader5 extension or GLSL 400"; + + _mesa_glsl_error(locp, this, "explicit stream requires %s", + requirement); + return false; + } + + return true; + } + bool check_explicit_attrib_location_allowed(YYLTYPE *locp, const ir_variable *var) { @@ -166,6 +179,11 @@ struct _mesa_glsl_parse_state { return true; } + bool has_explicit_attrib_stream() const + { + return ARB_gpu_shader5_enable || is_version(400, 0); + } + bool has_explicit_attrib_location() const { return ARB_explicit_attrib_location_enable || is_version(330, 300); |