From 8d980bf920a15855a1d7462a63938abb0f1a5315 Mon Sep 17 00:00:00 2001 From: Grigori Goronzy Date: Thu, 29 Jun 2017 07:39:55 +0200 Subject: [PATCH] st/mesa: Add KHR_no_error toggle to driconf MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Allows applications to be whitelisted. v2: Remove misguided DRI common part. Reviewed-by: Marek Olšák --- src/gallium/state_trackers/dri/dri_context.c | 3 +++ src/gallium/state_trackers/dri/dri_screen.c | 1 + src/mesa/drivers/dri/common/xmlpool/t_options.h | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 275c0d4..8c3797e4 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -124,6 +124,9 @@ dri_create_context(gl_api api, const struct gl_config * visual, ctx->cPriv = cPriv; ctx->sPriv = sPriv; + if (driQueryOptionb(&screen->optionCache, "mesa_no_error")) + attribs.flags |= ST_CONTEXT_FLAG_NO_ERROR; + attribs.options = screen->options; dri_fill_st_visual(&attribs.visual, screen, visual); ctx->st = stapi->create_context(stapi, &screen->base, &attribs, &ctx_err, diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index a0d9b34..1dd7bd3 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -56,6 +56,7 @@ const __DRIconfigOptionsExtension gallium_config_options = { DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE DRI_CONF_MESA_GLTHREAD("false") + DRI_CONF_MESA_NO_ERROR("false") DRI_CONF_DISABLE_EXT_BUFFER_AGE("false") DRI_CONF_DISABLE_OML_SYNC_CONTROL("false") DRI_CONF_SECTION_END diff --git a/src/mesa/drivers/dri/common/xmlpool/t_options.h b/src/mesa/drivers/dri/common/xmlpool/t_options.h index 9aa1798..e308839 100644 --- a/src/mesa/drivers/dri/common/xmlpool/t_options.h +++ b/src/mesa/drivers/dri/common/xmlpool/t_options.h @@ -332,6 +332,11 @@ DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \ DRI_CONF_DESC(en,gettext("Enable offloading GL driver work to a separate thread")) \ DRI_CONF_OPT_END +#define DRI_CONF_MESA_NO_ERROR(def) \ +DRI_CONF_OPT_BEGIN_B(mesa_no_error, def) \ + DRI_CONF_DESC(en,gettext("Disable GL driver error checking")) \ +DRI_CONF_OPT_END + #define DRI_CONF_DISABLE_EXT_BUFFER_AGE(def) \ DRI_CONF_OPT_BEGIN_B(glx_disable_ext_buffer_age, def) \ DRI_CONF_DESC(en, gettext("Disable the GLX_EXT_buffer_age extension")) \ -- 2.7.4