brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: Protect GLX SwapEvent symbols

Browse Source 
We need to guard the usage of symbols related to the
GLX_INTEL_swap_event extension, to avoid breaking on platforms and/or
versions of Mesa that do not expose that extension.
This commit is contained in:
Emmanuele Bassi 2011-04-12 20:28:36 +01:00
parent 2bbb0d895b
commit 29e5531486
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cogl/winsys/cogl-winsys-glx.c
View File

@ -238,14 +238,22 @@ glx_event_filter_cb (XEvent *xevent, void *data)
xevent->xconfigure.width, xevent->xconfigure.width,
xevent->xconfigure.height); xevent->xconfigure.height);
} }
/* we let ConfigureNotify pass through */
return COGL_XLIB_FILTER_CONTINUE;
} }
else if (xevent->type ==
(glx_renderer->glx_event_base + GLX_BufferSwapComplete)) #ifdef GLX_INTEL_swap_event
if (xevent->type == (glx_renderer->glx_event_base + GLX_BufferSwapComplete))
{ {
GLXBufferSwapComplete *swap_event = (GLXBufferSwapComplete *)xevent; GLXBufferSwapComplete *swap_event = (GLXBufferSwapComplete *) xevent;
notify_swap_buffers (context, swap_event->drawable); notify_swap_buffers (context, swap_event->drawable);
/* remove SwapComplete events from the queue */
return COGL_XLIB_FILTER_REMOVE; return COGL_XLIB_FILTER_REMOVE;
} }
#endif /* GLX_INTEL_swap_event */
return COGL_XLIB_FILTER_CONTINUE; return COGL_XLIB_FILTER_CONTINUE;
} }