fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 23:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "i965: Enable flush control"

Browse source 
This reverts commit 6ce9006d76.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104490
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2018-01-15 13:47:01 -05:00
parent 8045f01e2a
commit f2a5d27ce2
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -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);

2
src/mesa/drivers/dri/i965/intel_screen.c
View file

@ -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