diff options
| author | Kenneth Graunke <[email protected]> | 2014-08-08 01:03:15 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-08-10 16:22:31 -0700 |
| commit | 31f1cbc24ddc32c2a7b768f9c017f2c7161c7728 (patch) | |
| tree | 130342a963b74190873d269bfa269e56232a14dd | |
| parent | b6df68ba5611bfd5b797301f32da0b9a33fc5849 (diff) | |
i965: Support the allow_glsl_extension_directive_midshader option.
This adds support for Marek's new driconf parameter, which avoids
totally white rendering in Unigine Valley (which attempts to enable
the GL_ARB_sample_shading extension in an illegal place).
Signed-off-by: Kenneth Graunke <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75664
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 52f2557504a..402d936bd70 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -570,6 +570,9 @@ brw_process_driconf_options(struct brw_context *brw) ctx->Const.DisableGLSLLineContinuations = driQueryOptionb(options, "disable_glsl_line_continuations"); + + ctx->Const.AllowGLSLExtensionDirectiveMidShader = + driQueryOptionb(options, "allow_glsl_extension_directive_midshader"); } GLboolean diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 5ebf1d505ae..ea0fc5814ff 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -84,6 +84,7 @@ DRI_CONF_BEGIN DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") + DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_OPT_BEGIN_B(shader_precompile, "true") DRI_CONF_DESC(en, "Perform code generation at shader link time.") |