diff options
| author | Brian Paul <[email protected]> | 2015-03-27 10:54:10 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-03-30 11:25:39 -0600 |
| commit | dbe67d76e0487b04a7b6081d9d46666db3c3ee3e (patch) | |
| tree | 4e86116fa17fc7f593d3030c7c5ba24ec77701ba /src/mesa | |
| parent | c519c4d85e7b4f9cad4e51dc08e8ae99bf3c810d (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/mtypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 8e1dba6f079..f7187686955 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3527,8 +3527,8 @@ struct gl_constants GLboolean ForceGLSLExtensionsWarn; /** - * If non-zero, forces GLSL shaders without the #version directive to behave - * as if they began with "#version ForceGLSLVersion". + * If non-zero, forces GLSL shaders to behave as if they began + * with "#version ForceGLSLVersion". */ GLuint ForceGLSLVersion; |