diff options
author | Marek Olšák <[email protected]> | 2013-07-30 22:29:24 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-07-30 23:31:28 +0200 |
commit | 0f6a7cb00c86fbdb415b01450bb1ece8cfe1e31d (patch) | |
tree | 33da25bd8026d511d0c4f08f65d4ff57e9a1a4b0 /src/glsl | |
parent | ab789393443629027dca16e0aad501d6c1c32cb0 (diff) |
mesa,glsl,st/dri: add a new driconf option force_glsl_version for Unigine
See documentation in mtypes.h.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 4f8fcab98db..a5bc20c2384 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -74,7 +74,8 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, this->num_builtins_to_link = 0; /* Set default language version and extensions */ - this->language_version = 110; + this->language_version = ctx->Const.ForceGLSLVersion ? + ctx->Const.ForceGLSLVersion : 110; this->es_shader = false; this->ARB_texture_rectangle_enable = true; |