diff options
| author | Brian Paul <brianp@vmware.com> | 2015-03-27 10:54:10 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-03-30 11:25:39 -0600 |
| commit | dbe67d76e0487b04a7b6081d9d46666db3c3ee3e (patch) | |
| tree | 4e86116fa17fc7f593d3030c7c5ba24ec77701ba /src/glsl/glsl_parser_extras.h | |
| parent | c519c4d85e7b4f9cad4e51dc08e8ae99bf3c810d (diff) | |
| download | external_mesa3d-dbe67d76e0487b04a7b6081d9d46666db3c3ee3e.zip external_mesa3d-dbe67d76e0487b04a7b6081d9d46666db3c3ee3e.tar.gz external_mesa3d-dbe67d76e0487b04a7b6081d9d46666db3c3ee3e.tar.bz2 | |
glsl: allow ForceGLSLVersion to override #version directives
Previously, the ctx->Const.ForceGLSLVersion setting only worked if
the shader lacked a #version directive. Now, the ForceGLSLVersion
setting will override the #version directive too.
This change should be safe since it should be rare to have an app
that has a mix of shader versions and we only wanted to override
the #version for shaders which lacked the #version directive.
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 0975c86..1f5478b 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -226,6 +226,7 @@ struct _mesa_glsl_parse_state { bool es_shader; unsigned language_version; + unsigned forced_language_version; gl_shader_stage stage; /** |