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

winsys-glx: Remove the vblank counter feature when indirect rendering

Browse Source 
Previously when Cogl detects that the GLX context is indirect it
resets the function pointers for the VBLANK_COUNTER feature to NULL.
However it wasn't removing the VBLANK_COUNTER feature flag. Some other
parts of the winsys check for that feature flag rather than checking
whether the pointer is NULL so it would end up calling an invalid
function pointer and crashing. This just fixes it to also clear the
feature flag.

https://bugzilla.gnome.org/show_bug.cgi?id=684917

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit e947c713a541086f80a308d22774229f0720196a)
This commit is contained in:
Neil Roberts 2012-09-27 14:12:08 +01:00
parent cfdc1c95eb
commit f9e7f8df94
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,6 +437,9 @@ update_winsys_features (CoglContext *context, GError **error)
{ {
glx_renderer->pf_glXGetVideoSync = NULL; glx_renderer->pf_glXGetVideoSync = NULL;
glx_renderer->pf_glXWaitVideoSync = NULL; glx_renderer->pf_glXWaitVideoSync = NULL;
COGL_FLAGS_SET (context->winsys_features,
COGL_WINSYS_FEATURE_VBLANK_COUNTER,
FALSE);
} }
if (glx_renderer->pf_glXWaitVideoSync) if (glx_renderer->pf_glXWaitVideoSync)