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 <ian.d.romanick@intel.com>
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user