From 09e7e2016b702e2c4b79a2c01e8abc1365b4c422 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 1 Apr 2015 14:36:09 -0600 Subject: [PATCH] glsl: check for forced_language_version in is_version() This is a follow-on fix from the earlier "glsl: allow ForceGLSLVersion to override #version directives" change. Since we're not changing the language_version field, we have to check forced_language_version here. Reviewed-by: Ian Romanick --- src/glsl/glsl_parser_extras.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 1f5478bdf7e..dae7864fdaf 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -105,8 +105,10 @@ struct _mesa_glsl_parse_state { { unsigned required_version = this->es_shader ? required_glsl_es_version : required_glsl_version; + unsigned this_version = this->forced_language_version + ? this->forced_language_version : this->language_version; return required_version != 0 - && this->language_version >= required_version; + && this_version >= required_version; } bool check_version(unsigned required_glsl_version, -- 2.30.2