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

2008-02-07 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-stage.c:
        * clutter/clutter-stage.h:
        * clutter/eglnative/clutter-stage-egl.c:
        * clutter/eglx/clutter-stage-egl.c:
        * clutter/osx/clutter-stage-osx.c:
        * clutter/sdl/clutter-stage-sdl.c:
        * clutter/x11/clutter-stage-x11.c:
        Add at least somne basic offscreen handling into all backends.
        Remove unused clutter_stage_set_offscreen vfunc. (#549)

        * clutter/clutter-texture.c:
        Minor API doc tweak, noting rowstride source in set_area
This commit is contained in:
Matthew Allum 2008-02-07 12:55:51 +00:00
parent c8499a7619
commit a3c79e567c
9 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2008-02-07 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-stage.c:
* clutter/clutter-stage.h:
* clutter/eglnative/clutter-stage-egl.c:
* clutter/eglx/clutter-stage-egl.c:
* clutter/osx/clutter-stage-osx.c:
* clutter/sdl/clutter-stage-sdl.c:
* clutter/x11/clutter-stage-x11.c:
Add at least somne basic offscreen handling into all backends.
Remove unused clutter_stage_set_offscreen vfunc. (#549)
* clutter/clutter-texture.c:
Minor API doc tweak, noting rowstride source in set_area
2008-02-07 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-score.c (traverse_children): Actually implement

4
clutter/clutter-stage.c
View File

@ -149,6 +149,10 @@ clutter_stage_set_property (GObject *object,
if (CLUTTER_ACTOR_IS_REALIZED (actor))
{
/* Backend needs to check this prop and handle accordingly
* in realise.
* FIXME: More 'obvious' implementation needed?
*/
clutter_actor_unrealize (actor);
priv->is_offscreen = g_value_get_boolean (value);
clutter_actor_realize (actor);

2
clutter/clutter-stage.h
View File

@ -103,8 +103,6 @@ struct _ClutterStageClass
gboolean fullscreen);
void (* set_cursor_visible) (ClutterStage *stage,
gboolean visible);
void (* set_offscreen) (ClutterStage *stage,
gboolean offscreen);
GdkPixbuf* (* draw_to_pixbuf) (ClutterStage *stage,
gint x,
gint y,

2
clutter/clutter-texture.c
View File

@ -2088,7 +2088,7 @@ texture_update_data (ClutterTexture *texture,
* @y: Y coordinate of upper left corner of region to update.
* @width: Width in pixels of region to update.
* @height: Height in pixels of region to update.
* @rowstride: Distance in bytes between row starts.
* @rowstride: Distance in bytes between row starts on source buffer.
* @bpp: bytes per pixel ( Currently only 4 supported )
* @flags: #ClutterTextureFlags
* @error: return location for a #GError, or %NULL

17
clutter/eglnative/clutter-stage-egl.c
View File

@ -148,7 +148,9 @@ clutter_stage_egl_realize (ClutterActor *actor)
}
else
{
/* FIXME */
g_warning("EGL Backend does not yet support offscreen rendering\n");
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
return;
}
clutter_stage_get_perspectivex (CLUTTER_STAGE (actor), &perspective);
@ -192,15 +194,6 @@ clutter_stage_egl_set_fullscreen (ClutterStage *stage,
G_OBJECT_TYPE_NAME (stage));
}
static void
clutter_stage_egl_set_offscreen (ClutterStage *stage,
gboolean offscreen)
{
g_warning ("Stage of type `%s' do not support ClutterStage::set_offscreen",
G_OBJECT_TYPE_NAME (stage));
}
static GdkPixbuf*
clutter_stage_egl_draw_to_pixbuf (ClutterStage *stage,
gint x,
@ -238,9 +231,7 @@ clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
actor_class->unrealize = clutter_stage_egl_unrealize;
actor_class->request_coords = clutter_stage_egl_request_coords;
actor_class->query_coords = clutter_stage_egl_query_coords;
stage_class->set_fullscreen = clutter_stage_egl_set_fullscreen;
stage_class->set_offscreen = clutter_stage_egl_set_offscreen;
stage_class->set_fullscreen = clutter_stage_egl_set_fullscreen;
stage_class->draw_to_pixbuf = clutter_stage_egl_draw_to_pixbuf;
}

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

@ -28,9 +28,11 @@ clutter_stage_egl_unrealize (ClutterActor *actor)
g_object_get (actor, "offscreen", &was_offscreen, NULL);
if (G_UNLIKELY (was_offscreen))
{
/* No support as yet for this */
}
else
{
@ -154,7 +156,9 @@ clutter_stage_egl_realize (ClutterActor *actor)
}
else
{
/* FIXME */
g_warning("EGL Backend does not yet support offscreen rendering\n");
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
return;
}
CLUTTER_SET_PRIVATE_FLAGS(actor, CLUTTER_ACTOR_SYNC_MATRICES);

10
clutter/osx/clutter-stage-osx.c
View File

@ -261,11 +261,21 @@ clutter_stage_osx_realize (ClutterActor *actor)
{
ClutterStageOSX *self = CLUTTER_STAGE_OSX (actor);
ClutterBackendOSX *backend_osx;
gboolean is_offscreen;
CLUTTER_NOTE (BACKEND, "realize");
CLUTTER_OSX_POOL_ALLOC();
g_object_get (actor, "offscreen", &is_offscreen, NULL);
if (is_offcreen)
{
g_warning("OSX Backend does not yet support offscreen rendering\n");
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
return;
}
if (CLUTTER_ACTOR_CLASS (clutter_stage_osx_parent_class)->realize)
CLUTTER_ACTOR_CLASS (clutter_stage_osx_parent_class)->realize (actor);

9
clutter/sdl/clutter-stage-sdl.c
View File

@ -151,14 +151,6 @@ clutter_stage_sdl_set_cursor_visible (ClutterStage *stage,
SDL_ShowCursor(show_cursor);
}
static void
clutter_stage_sdl_set_offscreen (ClutterStage *stage,
gboolean offscreen)
{
g_warning ("Stage of type `%s' do not support ClutterStage::set_offscreen",
G_OBJECT_TYPE_NAME (stage));
}
static GdkPixbuf*
clutter_stage_sdl_draw_to_pixbuf (ClutterStage *stage,
GdkPixbuf *dest,
@ -207,7 +199,6 @@ clutter_stage_sdl_class_init (ClutterStageSDLClass *klass)
stage_class->set_fullscreen = clutter_stage_sdl_set_fullscreen;
stage_class->set_cursor_visible = clutter_stage_sdl_set_cursor_visible;
stage_class->set_offscreen = clutter_stage_sdl_set_offscreen;
stage_class->draw_to_pixbuf = clutter_stage_sdl_draw_to_pixbuf;
stage_class->set_title = clutter_stage_sdl_set_title;
}

8
clutter/x11/clutter-stage-x11.c
View File

@ -375,13 +375,6 @@ clutter_stage_x11_set_user_resize (ClutterStage *stage,
clutter_stage_x11_fix_window_size (stage_x11);
}
static void
clutter_stage_x11_set_offscreen (ClutterStage *stage,
gboolean offscreen)
{
/* Do nothing ? */
}
static void
clutter_stage_x11_dispose (GObject *gobject)
{
@ -409,7 +402,6 @@ clutter_stage_x11_class_init (ClutterStageX11Class *klass)
stage_class->set_fullscreen = clutter_stage_x11_set_fullscreen;
stage_class->set_cursor_visible = clutter_stage_x11_set_cursor_visible;
stage_class->set_offscreen = clutter_stage_x11_set_offscreen;
stage_class->set_title = clutter_stage_x11_set_title;
stage_class->set_user_resize = clutter_stage_x11_set_user_resize;
}