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

2007-07-23 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-texture.c: (texture_render_to_gl_quad),
        (clutter_texture_paint):
        Dont be over aggressive in throwing criticals for unrealized
        textures. Doesn't make sense for sub classes. (#403)
This commit is contained in:
Matthew Allum 2007-07-23 17:02:52 +00:00
parent 3648488017
commit e227bf70e2
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-23 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-texture.c: (texture_render_to_gl_quad),
(clutter_texture_paint):
Dont be over aggressive in throwing criticals for unrealized
textures. Doesn't make sense for sub classes. (#403)
2007-07-22 Emmanuele Bassi <ebassi@openedhand.com> 2007-07-22 Emmanuele Bassi <ebassi@openedhand.com>
Two small fixes for correctly debugging the deinitialisation Two small fixes for correctly debugging the deinitialisation

22
clutter/clutter-texture.c
View File

@ -303,11 +303,6 @@ texture_render_to_gl_quad (ClutterTexture *texture,
qwidth = x2-x1; qwidth = x2-x1;
qheight = y2-y1; qheight = y2-y1;
if (!CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR(texture)))
clutter_actor_realize (CLUTTER_ACTOR(texture));
g_return_if_fail(priv->tiles != NULL);
if (!priv->is_tiled) if (!priv->is_tiled)
{ {
cogl_texture_bind (priv->target_type, priv->tiles[0]); cogl_texture_bind (priv->target_type, priv->tiles[0]);
@ -703,6 +698,23 @@ clutter_texture_paint (ClutterActor *self)
gint x1, y1, x2, y2; gint x1, y1, x2, y2;
ClutterColor col = { 0xff, 0xff, 0xff, 0xff }; ClutterColor col = { 0xff, 0xff, 0xff, 0xff };
if (!CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR(texture)))
clutter_actor_realize (CLUTTER_ACTOR(texture));
if (texture->priv->tiles == NULL)
{
/* We just need do debug this state, it doesn't really need to
* throw a an error as what previously happened. Sub classes
* quite likely may not be able to realize.
*/
CLUTTER_NOTE (PAINT,
"unable to paint texture '%s', contains no tiles",
clutter_actor_get_name (self)
? clutter_actor_get_name (self)
: "unknown");
return;
}
CLUTTER_NOTE (PAINT, CLUTTER_NOTE (PAINT,
"painting texture '%s'", "painting texture '%s'",
clutter_actor_get_name (self) ? clutter_actor_get_name (self) clutter_actor_get_name (self) ? clutter_actor_get_name (self)