GitLab will be down for maintenance this Sunday 13th June, from approx 7-11am UTC. This is for a PostgreSQL migration. See the tracker issue for more informations.

Commit 580fbbb5 authored by Martin Peres's avatar Martin Peres
Browse files

driconf: remove the redundant glx-extension-disabling options



Now that we introduced the generic glx_extension_override option,
we can remove the glx_disable_oml_sync_control,
glx_disable_sgi_video_sync, and glx_disable_ext_buffer_age ones.

It seems like the only user for them was the vmwgfx, and only for
Gnome and Compiz which are covered by the default mesa driconf. This
means that it is unlikely for a user to have these options set in
their local driconf file.
Suggested-by: Timothy Arceri's avatarTimothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Timothy Arceri's avatarTimothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Martin Peres's avatarMartin Peres <martin.peres@mupuf.org>
Part-of: <!7252>
parent 3fa3bc19
Pipeline #228331 waiting for manual action with stages
in 2 minutes and 32 seconds
GL_EXT_demote_to_helper_invocation on radeonsi
EGL_MESA_platform_xcb
driconf: remove glx_disable_oml_sync_control, glx_disable_sgi_video_sync, and glx_disable_ext_buffer_age
......@@ -2,9 +2,6 @@
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_DISABLE_SGI_VIDEO_SYNC(false)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY
......
......@@ -1232,7 +1232,6 @@ dri2CreateScreen(int screen, struct glx_display * priv)
char *driverName = NULL, *loader_driverName, *deviceName, *tmp;
drm_magic_t magic;
int i;
unsigned char disable;
psc = calloc(1, sizeof *psc);
if (psc == NULL)
......@@ -1351,16 +1350,11 @@ dri2CreateScreen(int screen, struct glx_display * priv)
psp->waitForSBC = dri2WaitForSBC;
psp->setSwapInterval = dri2SetSwapInterval;
psp->getSwapInterval = dri2GetSwapInterval;
if (psc->config->configQueryb(psc->driScreen,
"glx_disable_oml_sync_control",
&disable) || !disable)
__glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control");
__glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control");
}
if (psc->config->configQueryb(psc->driScreen,
"glx_disable_sgi_video_sync",
&disable) || !disable)
__glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
if (psc->config->base.version > 1 &&
psc->config->configQuerys(psc->driScreen, "glx_extension_override",
......
......@@ -847,7 +847,6 @@ dri3_create_screen(int screen, struct glx_display * priv)
struct glx_config *configs = NULL, *visuals = NULL;
char *driverName, *tmp;
int i;
unsigned char disable;
psc = calloc(1, sizeof *psc);
if (psc == NULL)
......@@ -979,24 +978,15 @@ 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;
if (psc->config->configQueryb(psc->driScreen,
"glx_disable_oml_sync_control",
&disable) || !disable)
__glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control");
if (psc->config->configQueryb(psc->driScreen,
"glx_disable_sgi_video_sync",
&disable) || !disable)
__glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
__glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_video_sync");
psp->copySubBuffer = dri3_copy_sub_buffer;
__glXEnableDirectExtension(&psc->base, "GLX_MESA_copy_sub_buffer");
psp->getBufferAge = dri3_get_buffer_age;
if (psc->config->configQueryb(psc->driScreen,
"glx_disable_ext_buffer_age",
&disable) || !disable)
__glXEnableDirectExtension(&psc->base, "GLX_EXT_buffer_age");
__glXEnableDirectExtension(&psc->base, "GLX_EXT_buffer_age");
if (psc->config->base.version > 1 &&
psc->config->configQuerys(psc->driScreen, "glx_extension_override",
......
......@@ -619,13 +619,10 @@ TODO: document the other workarounds.
<!-- vmwgfx doesn't like full buffer swaps and can't sync to vertical retraces.-->
<device driver="vmwgfx">
<application name="gnome-shell" executable="gnome-shell">
<option name="glx_disable_ext_buffer_age" value="true" />
<option name="glx_disable_oml_sync_control" value="true" />
<option name="glx_disable_sgi_video_sync" value="true" />
<option name="glx_extension_override" value="-GLX_EXT_buffer_age -GLX_OML_sync_control -GLX_SGI_video_sync" />
</application>
<application name="Compiz" executable="Compiz">
<option name="glx_disable_ext_buffer_age" value="true" />
<option name="glx_disable_oml_sync_control" value="true" />
<option name="glx_extension_override" value="-GLX_EXT_buffer_age -GLX_OML_sync_control" />
</application>
</device>
<device driver="radeonsi">
......
......@@ -311,19 +311,6 @@
DRI_CONF_OPT_B(mesa_no_error, def, \
"Disable GL driver error checking")
#define DRI_CONF_DISABLE_EXT_BUFFER_AGE(def) \
DRI_CONF_OPT_B(glx_disable_ext_buffer_age, def, \
"Disable the GLX_EXT_buffer_age extension")
#define DRI_CONF_DISABLE_OML_SYNC_CONTROL(def) \
DRI_CONF_OPT_B(glx_disable_oml_sync_control, def, \
"Disable the GLX_OML_sync_control extension")
#define DRI_CONF_DISABLE_SGI_VIDEO_SYNC(def) \
DRI_CONF_OPT_B(glx_disable_sgi_video_sync, def, \
"Disable the GLX_SGI_video_sync extension")
/**
* \brief Miscellaneous configuration options
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment