isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 03:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-05-17 Matthew Allum <mallum@openedhand.com>

Browse Source 
* configure.ac:
        Fix CLUTTER_NO_FPU typo.
This commit is contained in:
Matthew Allum 2007-05-17 09:08:50 +00:00
parent 733a767657
commit 26646d255a
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-17 Matthew Allum <mallum@openedhand.com>
* configure.ac:
Fix CLUTTER_NO_FPU typo.
2007-05-17 Tomas Frydrych <tf@openedhand.com> 2007-05-17 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-alpha.h: * clutter/clutter-alpha.h:

6
clutter/clutter-private.h
View File

@ -68,7 +68,11 @@ typedef enum {
CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0, CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0,
CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1, CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1,
CLUTTER_ACTOR_IN_REPARENT = 1 << 2 CLUTTER_ACTOR_IN_REPARENT = 1 << 2,
CLUTTER_ACTOR_SYNC_MATRICES = 1 << 3 /* Used by stage to indicate GL
* viewport / perspective etc
* needs (re)setting.
*/
} ClutterPrivateFlags; } ClutterPrivateFlags;
#define CLUTTER_PRIVATE_FLAGS(a) (CLUTTER_ACTOR ((a))->private_flags) #define CLUTTER_PRIVATE_FLAGS(a) (CLUTTER_ACTOR ((a))->private_flags)

17
clutter/glx/clutter-stage-glx.c
View File

@ -313,17 +313,29 @@ clutter_stage_glx_paint (ClutterActor *self)
CLUTTER_NOTE (PAINT, " Redraw enter"); CLUTTER_NOTE (PAINT, " Redraw enter");
/* Setup FPS count */
if (clutter_get_show_fps ()) if (clutter_get_show_fps ())
{ {
if (!timer) if (!timer)
timer = g_timer_new (); timer = g_timer_new ();
} }
clutter_stage_get_color (stage, &stage_color); /* Reset view matrices if needed. */
if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_SYNC_MATRICES)
{
/*
cogl_set_view_matrix (view_width,
view_height,
perspective)
*/
}
/* Setup the initial paint */
clutter_stage_get_color (stage, &stage_color);
cogl_paint_init (&stage_color); cogl_paint_init (&stage_color);
/* chain up to reach ClutterGroup->paint here */ /* chain up to reach ClutterGroup->paint here and actually paint all */
CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self); 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
@ -340,6 +352,7 @@ clutter_stage_glx_paint (ClutterActor *self)
CLUTTER_GLERR (); CLUTTER_GLERR ();
} }
/* Complete FPS info */
if (clutter_get_show_fps ()) if (clutter_get_show_fps ())
{ {
timer_n_frames++; timer_n_frames++;

2
configure.ac
View File

@ -252,7 +252,7 @@ if test "x$with_fpu" != "xyes" ; then
CLUTTER_FIXED_CFLAGS="-DCFX_NO_FPU" CLUTTER_FIXED_CFLAGS="-DCFX_NO_FPU"
fi fi
AC_SUBST(CLUTTER_HAS_FPU) AC_SUBST(CLUTTER_NO_FPU)
dnl = GTK Doc check ======================================================== dnl = GTK Doc check ========================================================