From 95bd8a332d1c3f868d8e4ff454fb308acd9beed9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 26 Sep 2013 17:17:06 -0700 Subject: [PATCH] dri: Move i965-specific context flag logic to dri common. Nobody else yet can do a forward context anyway, but others should be able to do debug contexts, and those would have just had no effect currently. --- src/mesa/drivers/dri/common/dri_util.c | 9 +++++++++ src/mesa/drivers/dri/i965/brw_context.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 32f0e33009f..db44eede651 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -47,6 +47,7 @@ #include "utils.h" #include "xmlpool.h" #include "../glsl/glsl_parser_extras.h" +#include "main/mtypes.h" #include "main/version.h" #include "main/macros.h" @@ -378,6 +379,14 @@ dri2CreateContextAttribs(__DRIscreen *screen, int api, return NULL; } + struct gl_context *ctx = context->driverPrivate; + if ((flags & __DRI_CTX_FLAG_FORWARD_COMPATIBLE) != 0) + ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; + if ((flags & __DRI_CTX_FLAG_DEBUG) != 0) { + ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT; + ctx->Debug.DebugOutput = GL_TRUE; + } + *error = __DRI_CTX_ERROR_SUCCESS; return context; } diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index c648d30cfaa..5d5f41a32fe 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -482,15 +482,7 @@ brwCreateContext(gl_api api, brw->disable_derivative_optimization = driQueryOptionb(&brw->optionCache, "disable_derivative_optimization"); - ctx->Const.ContextFlags = 0; - if ((flags & __DRI_CTX_FLAG_FORWARD_COMPATIBLE) != 0) - ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; - - ctx->Debug.DebugOutput = GL_FALSE; if ((flags & __DRI_CTX_FLAG_DEBUG) != 0) { - ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT; - ctx->Debug.DebugOutput = GL_TRUE; - /* Turn on some extra GL_ARB_debug_output generation. */ brw->perf_debug = true; } -- 2.30.2