diff options
| -rw-r--r-- | src/glx/dri2_glx.c | 7 | ||||
| -rw-r--r-- | src/glx/dri3_glx.c | 11 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/xmlpool/t_options.h | 10 |
3 files changed, 25 insertions, 3 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 4f163688f2c..ae8cb11ef8f 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -1311,12 +1311,17 @@ dri2CreateScreen(int screen, struct glx_display * priv) psp->getBufferAge = NULL; if (pdp->driMinor >= 2) { + unsigned char disable; + psp->getDrawableMSC = dri2DrawableGetMSC; psp->waitForMSC = dri2WaitForMSC; psp->waitForSBC = dri2WaitForSBC; psp->setSwapInterval = dri2SetSwapInterval; psp->getSwapInterval = dri2GetSwapInterval; - __glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control"); + if (psc->config->configQueryb(psc->driScreen, + "glx_disable_oml_sync_control", + &disable) || !disable) + __glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control"); } /* DRI2 supports SubBuffer through DRI2CopyRegion, so it's always diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 63474d0dca2..509160697f8 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -796,6 +796,7 @@ dri3_create_screen(int screen, struct glx_display * priv) struct glx_config *configs = NULL, *visuals = NULL; char *driverName, *deviceName, *tmp; int i; + unsigned char disable; psc = calloc(1, sizeof *psc); if (psc == NULL) @@ -934,13 +935,19 @@ dri3_create_screen(int screen, struct glx_display * priv) psp->waitForSBC = dri3_wait_for_sbc; psp->setSwapInterval = dri3_set_swap_interval; psp->getSwapInterval = dri3_get_swap_interval; - __glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control"); + if (psc->config->configQueryb(psc->driScreen, + "glx_disable_oml_sync_control", + &disable) || !disable) + __glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control"); psp->copySubBuffer = dri3_copy_sub_buffer; __glXEnableDirectExtension(&psc->base, "GLX_MESA_copy_sub_buffer"); psp->getBufferAge = dri3_get_buffer_age; - __glXEnableDirectExtension(&psc->base, "GLX_EXT_buffer_age"); + if (psc->config->configQueryb(psc->driScreen, + "glx_disable_ext_buffer_age", + &disable) || !disable) + __glXEnableDirectExtension(&psc->base, "GLX_EXT_buffer_age"); free(driverName); free(deviceName); diff --git a/src/mesa/drivers/dri/common/xmlpool/t_options.h b/src/mesa/drivers/dri/common/xmlpool/t_options.h index ec0f3f7eaca..8a7d04f00ff 100644 --- a/src/mesa/drivers/dri/common/xmlpool/t_options.h +++ b/src/mesa/drivers/dri/common/xmlpool/t_options.h @@ -328,6 +328,16 @@ 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_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")) \ +DRI_CONF_OPT_END + +#define DRI_CONF_DISABLE_OML_SYNC_CONTROL(def) \ +DRI_CONF_OPT_BEGIN_B(glx_disable_oml_sync_control, def) \ + DRI_CONF_DESC(en, gettext("Disable the GLX_OML_sync_control extension")) \ +DRI_CONF_OPT_END + /** * \brief Software-fallback options. To allow using features (like |