mirror of
https://github.com/brl/mutter.git
synced 2025-02-23 08:24:09 +00:00
2008-05-13 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/fruity/clutter-stage-fruity.c: (clutter_stage_egl_show), (clutter_stage_egl_hide): Don't chain up and set flags, as it is not needed anymore. (clutter_stage_egl_realize): Set the REALIZED flag. * clutter/eglnative/clutter-stage-egl.c: (clutter_stage_egl_show), (clutter_stage_egl_hide): Don't chain up and set flags, as it is not needed anymore.
This commit is contained in:
parent
d141f781ec
commit
04f3e42253
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2008-05-13 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter/fruity/clutter-stage-fruity.c:
|
||||
(clutter_stage_egl_show), (clutter_stage_egl_hide): Don't chain
|
||||
up and set flags, as it is not needed anymore.
|
||||
|
||||
(clutter_stage_egl_realize): Set the REALIZED flag.
|
||||
|
||||
* clutter/eglnative/clutter-stage-egl.c:
|
||||
(clutter_stage_egl_show), (clutter_stage_egl_hide): Don't chain
|
||||
up and set flags, as it is not needed anymore.
|
||||
|
||||
2008-05-13 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter/glx/clutter-stage-glx.c:
|
||||
|
@ -29,23 +29,13 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageEGL,
|
||||
static void
|
||||
clutter_stage_egl_show (ClutterActor *actor)
|
||||
{
|
||||
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
|
||||
|
||||
CLUTTER_ACTOR_SET_FLAGS (stage_egl, CLUTTER_ACTOR_MAPPED);
|
||||
CLUTTER_ACTOR_SET_FLAGS (stage_egl->wrapper, CLUTTER_ACTOR_MAPPED);
|
||||
|
||||
CLUTTER_ACTOR_CLASS (clutter_stage_egl_parent_class)->show (actor);
|
||||
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_stage_egl_hide (ClutterActor *actor)
|
||||
{
|
||||
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
|
||||
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (stage_egl, CLUTTER_ACTOR_MAPPED);
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (stage_egl->wrapper, CLUTTER_ACTOR_MAPPED);
|
||||
|
||||
CLUTTER_ACTOR_CLASS (clutter_stage_egl_parent_class)->hide (actor);
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -29,22 +29,13 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageEGL,
|
||||
static void
|
||||
clutter_stage_egl_show (ClutterActor *actor)
|
||||
{
|
||||
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
|
||||
|
||||
CLUTTER_ACTOR_SET_FLAGS (stage_egl, CLUTTER_ACTOR_MAPPED);
|
||||
CLUTTER_ACTOR_SET_FLAGS (stage_egl->wrapper, CLUTTER_ACTOR_MAPPED);
|
||||
|
||||
CLUTTER_ACTOR_CLASS (clutter_stage_egl_parent_class)->show (actor);
|
||||
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_stage_egl_hide (ClutterActor *actor)
|
||||
{
|
||||
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
|
||||
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (stage_egl, CLUTTER_ACTOR_MAPPED);
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (stage_egl->wrapper, CLUTTER_ACTOR_MAPPED);
|
||||
CLUTTER_ACTOR_CLASS (clutter_stage_egl_parent_class)->hide (actor);
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -174,6 +165,7 @@ clutter_stage_egl_realize (ClutterActor *actor)
|
||||
|
||||
/* this will make sure to set the current context */
|
||||
CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context");
|
||||
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
|
||||
|
||||
/* this should be done in ClutterBackend::ensure_context */
|
||||
status = eglMakeCurrent (backend_egl->edpy,
|
||||
@ -185,6 +177,7 @@ clutter_stage_egl_realize (ClutterActor *actor)
|
||||
{
|
||||
g_critical ("eglMakeCurrent failed");
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user