fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-19 17:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: check for forced_language_version in is_version()

Browse source 
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 <ian.d.romanick@intel.com>
This commit is contained in:
Brian Paul 2015-04-01 14:36:09 -06:00
parent 4deca1274c
commit 09e7e2016b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glsl/glsl_parser_extras.h
View file

@ -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,