diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-07-31 10:40:43 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-07-31 10:52:54 -0700 |
| commit | 03ac5c54b55006a7014525c3dc1ebd6ed215b6be (patch) | |
| tree | 74272facca36bd38a21995d5a8592e380586cfe0 /src/glsl/glsl_parser.yy | |
| parent | d84b3a5a3c855e3f2ffc83bbbda9d615b04c0ad2 (diff) | |
| download | external_mesa3d-03ac5c54b55006a7014525c3dc1ebd6ed215b6be.zip external_mesa3d-03ac5c54b55006a7014525c3dc1ebd6ed215b6be.tar.gz external_mesa3d-03ac5c54b55006a7014525c3dc1ebd6ed215b6be.tar.bz2 | |
glsl: Fix #pragma invariant(all) language version check.
It was using state->Const.GLSL_100ES, which is set if the driver
supports ARB_ES2_compatibility or we're in ES2 mode. Instead, it should
use state->language_version, as that represents the actual GLSL version
of the shader being compiled.
Since the correct logic is < 120 && !100, just make it == 110.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index f61d6b8..9873934 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -301,7 +301,7 @@ pragma_statement: | PRAGMA_OPTIMIZE_OFF EOL | PRAGMA_INVARIANT_ALL EOL { - if (state->language_version < 120 && !state->Const.GLSL_100ES) { + if (state->language_version == 110) { _mesa_glsl_warning(& @1, state, "pragma `invariant(all)' not supported in %s", state->version_string); |