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

2008-04-10 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/eglx/clutter-stage-egl.c:
	(clutter_stage_egl_realize): Sync up with the GLX backend.
This commit is contained in:
Emmanuele Bassi 2008-04-10 19:54:08 +00:00
parent 497734062c
commit c97bcb37ba
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-04-10 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglx/clutter-stage-egl.c:
(clutter_stage_egl_realize): Sync up with the GLX backend.
2008-04-09 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/Makefile.am: Update the regular expression to match * clutter/Makefile.am: Update the regular expression to match

5
clutter/eglx/clutter-stage-egl.c
View File

@ -154,7 +154,6 @@ clutter_stage_egl_realize (ClutterActor *actor)
{ {
g_critical ("Unable to create an EGL surface"); g_critical ("Unable to create an EGL surface");
CLUTTER_ACTOR_UNSET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
return; return;
} }
@ -172,13 +171,15 @@ clutter_stage_egl_realize (ClutterActor *actor)
{ {
g_critical ("Unable to create a suitable EGL context"); g_critical ("Unable to create a suitable EGL context");
CLUTTER_ACTOR_UNSET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
return; return;
} }
} }
/* this will make sure to set the current context */
CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context");
CLUTTER_ACTOR_SET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED); CLUTTER_ACTOR_SET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
CLUTTER_ACTOR_SET_FLAGS (stage_x11, CLUTTER_ACTOR_REALIZED);
clutter_stage_ensure_current (stage_x11->wrapper); clutter_stage_ensure_current (stage_x11->wrapper);
} }
else else