From f2a5d27ce2c7c4e64afb5fa46005fe522268766c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 15 Jan 2018 13:47:01 -0500 Subject: [PATCH] Revert "i965: Enable flush control" This reverts commit 6ce9006d76c050663af0be61cc88c3215d6f8cea. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104490 Signed-off-by: Adam Jackson --- src/mesa/drivers/dri/i965/brw_context.c | 20 +------------------- src/mesa/drivers/dri/i965/intel_screen.c | 2 -- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index f765cff76b9..c30eae420cd 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -860,9 +860,7 @@ brwCreateContext(gl_api api, return false; } - if (ctx_config->attribute_mask & - ~(__DRIVER_CONTEXT_ATTRIB_RESET_STRATEGY | - __DRIVER_CONTEXT_ATTRIB_RELEASE_BEHAVIOR)) { + if (ctx_config->attribute_mask & ~__DRIVER_CONTEXT_ATTRIB_RESET_STRATEGY) { *dri_ctx_error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; return false; } @@ -871,20 +869,6 @@ brwCreateContext(gl_api api, ((ctx_config->attribute_mask & __DRIVER_CONTEXT_ATTRIB_RESET_STRATEGY) && ctx_config->reset_strategy != __DRI_CTX_RESET_NO_NOTIFICATION); - GLenum release_behavior = GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH; - if (ctx_config->attribute_mask & __DRIVER_CONTEXT_ATTRIB_RELEASE_BEHAVIOR) { - switch (ctx_config->release_behavior) { - case __DRI_CTX_RELEASE_BEHAVIOR_NONE: - release_behavior = GL_NONE; - break; - case __DRI_CTX_RELEASE_BEHAVIOR_FLUSH: - break; - default: - *dri_ctx_error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; - return false; - } - } - struct brw_context *brw = rzalloc(NULL, struct brw_context); if (!brw) { fprintf(stderr, "%s: failed to alloc context\n", __func__); @@ -1064,8 +1048,6 @@ brwCreateContext(gl_api api, ctx->Const.RobustAccess = GL_TRUE; } - ctx->Const.ContextReleaseBehavior = release_behavior; - if (INTEL_DEBUG & DEBUG_SHADER_TIME) brw_init_shader_time(brw); diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 08032c9b224..190d8ecb115 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1503,7 +1503,6 @@ static const __DRIextension *screenExtensions[] = { &intelRendererQueryExtension.base, &dri2ConfigQueryExtension.base, &dri2NoErrorExtension.base, - &dri2FlushControlExtension.base, NULL }; @@ -1514,7 +1513,6 @@ static const __DRIextension *intelRobustScreenExtensions[] = { &intelImageExtension.base, &intelRendererQueryExtension.base, &dri2ConfigQueryExtension.base, - &dri2FlushControlExtension.base, &dri2Robustness.base, &dri2NoErrorExtension.base, NULL -- 2.30.2