Do not check if the ClutterStageGlx parent paint vfunc is set: we

set it ourselves.
This commit is contained in:
Emmanuele Bassi 2007-03-27 09:38:27 +00:00
parent 464f24fdc0
commit 898f84c9c7
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2007-03-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/glx/clutter-stage-glx.c: Remove the check in the
paint chain up: we know for sure that the parent's paint
vfunc is present.
2007-03-27 Matthew Allum <mallum@openedhand.com> 2007-03-27 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-feature.c: * clutter/clutter-feature.c:

View File

@ -311,10 +311,8 @@ clutter_stage_glx_paint (ClutterActor *self)
glDisable (GL_LIGHTING); glDisable (GL_LIGHTING);
glDisable (GL_DEPTH_TEST); glDisable (GL_DEPTH_TEST);
/* FIXME Check is redundant */ /* chain up to reach ClutterGroup->paint here */
if (G_LIKELY(CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint)) CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self);
/* Basically call up to ClutterGroup paint here */
CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self);
/* Why this paint is done in backend as likely GL windowing system /* Why this paint is done in backend as likely GL windowing system
* specific calls, like swapping buffers. * specific calls, like swapping buffers.
@ -442,7 +440,7 @@ clutter_stage_glx_set_cursor_visible (ClutterStage *stage,
if (stage_glx->xwin == None) if (stage_glx->xwin == None)
return; return;
CLUTTER_NOTE (MISC, "setting cursor state (%s) over stage window (%u)", CLUTTER_NOTE (MISC, "setting cursor state ('%s') over stage window (%u)",
show_cursor ? "visible" : "invisible", show_cursor ? "visible" : "invisible",
(unsigned int) stage_glx->xwin); (unsigned int) stage_glx->xwin);