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

[glx] Perform more checks before calling glXMakeCurrent

Browse Source 
Right now we just check for a NULL stage before calling glXMakeCurrent().

We can, though, get a valid stage without an implementation attached to
it while we are disposing a stage after a CLUTTER_DELETE event, since the
events processing is performed on a vblank-locked basis.
This commit is contained in:
Emmanuele Bassi 2009-08-21 12:05:52 +01:00
parent 93e1d8e7a3
commit 172074fd29
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/glx/clutter-backend-glx.c
View File

@ -409,7 +409,14 @@ static void
clutter_backend_glx_ensure_context (ClutterBackend *backend, clutter_backend_glx_ensure_context (ClutterBackend *backend,
ClutterStage *stage) ClutterStage *stage)
{ {
if (stage == NULL) ClutterStageWindow *impl;
/* if there is no stage, the stage is being destroyed or it has no
* implementation attached to it then we clear the GL context
*/
if (stage == NULL ||
(CLUTTER_PRIVATE_FLAGS (stage) & CLUTTER_ACTOR_IN_DESTRUCTION) ||
((impl = _clutter_stage_get_window (stage)) == NULL))
{ {
ClutterBackendX11 *backend_x11; ClutterBackendX11 *backend_x11;
@ -423,9 +430,7 @@ clutter_backend_glx_ensure_context (ClutterBackend *backend,
ClutterBackendGLX *backend_glx; ClutterBackendGLX *backend_glx;
ClutterStageGLX *stage_glx; ClutterStageGLX *stage_glx;
ClutterStageX11 *stage_x11; ClutterStageX11 *stage_x11;
ClutterStageWindow *impl;
impl = _clutter_stage_get_window (stage);
g_assert (impl != NULL); g_assert (impl != NULL);
CLUTTER_NOTE (MULTISTAGE, "Setting context for stage of type %s [%p]", CLUTTER_NOTE (MULTISTAGE, "Setting context for stage of type %s [%p]",