summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/i965')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c9
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c1
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index d4bbe0b2b6f..571618a9cab 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -990,6 +990,13 @@ brwCreateContext(gl_api api,
if (notify_reset)
functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+ brw_process_driconf_options(brw);
+
+ if (api == API_OPENGL_CORE &&
+ driQueryOptionb(&screen->optionCache, "force_compat_profile")) {
+ api = API_OPENGL_COMPAT;
+ }
+
struct gl_context *ctx = &brw->ctx;
if (!_mesa_initialize_context(ctx, api, mesaVis, shareCtx, &functions)) {
@@ -1024,8 +1031,6 @@ brwCreateContext(gl_api api,
_mesa_meta_init(ctx);
- brw_process_driconf_options(brw);
-
if (INTEL_DEBUG & DEBUG_PERF)
brw->perf_debug = true;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index b669f8d138c..83f2f4c2465 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -88,6 +88,7 @@ DRI_CONF_BEGIN
DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION("false")
DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH("false")
DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false")
+ DRI_CONF_FORCE_COMPAT_PROFILE("false")
DRI_CONF_FORCE_GLSL_ABS_SQRT("false")
DRI_CONF_OPT_BEGIN_B(shader_precompile, "true")