diff options
author | Eric Anholt <[email protected]> | 2012-01-18 12:14:09 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2012-01-30 11:41:49 -0800 |
commit | b9e27cc1426e3242a003fa5ae91fab330694009a (patch) | |
tree | c78fcfb4d43c916b1d9604d0d931f90feb06fc2b /src | |
parent | 61b9ccd9e298ca1d3db55aee0cb2ff78662d6fa6 (diff) |
mesa: Add a flag for forcing all GLSL extensions to "warn".
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 | ||||
-rw-r--r-- | src/mesa/main/mtypes.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 0b53232e9e7..7f8d47ce9bc 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -114,6 +114,9 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *ctx, } this->supported_version_string = supported; + + if (ctx->Const.ForceGLSLExtensionsWarn) + _mesa_glsl_process_extension("all", NULL, "warn", NULL, this); } const char * diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index a2b01d05d22..99dcb389b62 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2772,6 +2772,12 @@ struct gl_constants GLuint GLSLVersion; /**< GLSL version supported (ex: 120 = 1.20) */ /** + * Changes default GLSL extension behavior from "error" to "warn". It's out + * of spec, but it can make some apps work that otherwise wouldn't. + */ + GLboolean ForceGLSLExtensionsWarn; + + /** * Does the driver support real 32-bit integers? (Otherwise, integers are * simulated via floats.) */ |