diff options
| author | Kenneth Graunke <[email protected]> | 2017-01-20 20:33:57 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-03 11:08:58 +0000 |
| commit | 06b9bc66d58dd6b2adf16142ca05875c953fcc5f (patch) | |
| tree | 8d1d29f1b4933c96f50c546336a482ef7c6f9125 | |
| parent | 270597d13fbd2659b17deddb215adabd32961459 (diff) | |
i965: Support the force_glsl_version driconf option.
Gallium drivers have had this for a while. It makes sense to support
it consistently across drivers, so expose it in i965 as well.
Cc: "17.0" <[email protected]>
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
(cherry picked from commit 2f7a7ae13196c58eddea75fc51637f8c2a8579b0)
| -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 84d34c0f6a0..f738199b75f 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -910,6 +910,9 @@ brw_process_driconf_options(struct brw_context *brw) ctx->Const.ForceGLSLExtensionsWarn = driQueryOptionb(options, "force_glsl_extensions_warn"); + ctx->Const.ForceGLSLVersion = + driQueryOptioni(options, "force_glsl_version"); + ctx->Const.DisableGLSLLineContinuations = driQueryOptionb(options, "disable_glsl_line_continuations"); diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 6ae211da3a1..66b4643971f 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -79,6 +79,7 @@ DRI_CONF_BEGIN DRI_CONF_ALWAYS_FLUSH_CACHE("false") DRI_CONF_DISABLE_THROTTLING("false") DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") + DRI_CONF_FORCE_GLSL_VERSION(0) DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false") |