summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2013-01-24 17:48:12 -0800
committerZack Rusin <zackr@vmware.com>2013-01-24 19:13:05 -0800
commitdbb2d192de33064ae6cdb799d71c5ac89a6ea8ff (patch)
treebac189b097722b0841ab920529bf35391d175d3f
parentc9343047cfc44039915e0b09fc94bd992559a982 (diff)
glx: only advertise GLX_INTEL_swap_event if it's supported
Only drivers supporting DRI2 version >=4 support GLX_INTEL_swap_event. So lets mark it as such otherwise applications which use this extension (i.e. everything based on Clutter, e.g. gnome-shell) break horribly on drivers supporting DRI2 versions only up to 3. Note: This is a candidate for the 9.0 branch. Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/glx/dri2_glx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 1b3cf2bfc4..a51716fedb 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1062,8 +1062,9 @@ dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions)
__glXEnableDirectExtension(&psc->base, "GLX_MESA_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_make_current_read");
- /* FIXME: if DRI2 version supports it... */
- __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
+ if (psc->dri2->base.version >= 4) {
+ __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
+ }
if (psc->dri2->base.version >= 3) {
const unsigned mask = psc->dri2->getAPIMask(psc->driScreen);