2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 275c0d45866..8c3797e4285 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 a0d9b34d667..1dd7bd3ec12 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