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

paint-nodes: Remove modelview from ClutterRootNode

Browse Source 
It's pointless, since RootNode sits at the top and there's no modelview
to be set.

https://bugzilla.gnome.org/show_bug.cgi?id=704625
This commit is contained in:
Emmanuele Bassi 2013-07-21 00:47:15 +01:00
parent 371b12c4af
commit 1d9e264051
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-paint-node-private.h
View File

@ -107,8 +107,7 @@ gpointer _clutter_paint_node_create (GType g
ClutterPaintNode * _clutter_root_node_new (CoglFramebuffer *framebuffer, ClutterPaintNode * _clutter_root_node_new (CoglFramebuffer *framebuffer,
const ClutterColor *clear_color, const ClutterColor *clear_color,
CoglBufferBit clear_flags, CoglBufferBit clear_flags);
const CoglMatrix *matrix);
ClutterPaintNode * _clutter_transform_node_new (const CoglMatrix *matrix); ClutterPaintNode * _clutter_transform_node_new (const CoglMatrix *matrix);
ClutterPaintNode * _clutter_dummy_node_new (ClutterActor *actor); ClutterPaintNode * _clutter_dummy_node_new (ClutterActor *actor);

12
clutter/clutter-paint-nodes.c
View File

@ -104,7 +104,6 @@ struct _ClutterRootNode
CoglBufferBit clear_flags; CoglBufferBit clear_flags;
CoglColor clear_color; CoglColor clear_color;
CoglMatrix modelview;
}; };
G_DEFINE_TYPE (ClutterRootNode, clutter_root_node, CLUTTER_TYPE_PAINT_NODE) G_DEFINE_TYPE (ClutterRootNode, clutter_root_node, CLUTTER_TYPE_PAINT_NODE)
@ -114,11 +113,6 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
{ {
ClutterRootNode *rnode = (ClutterRootNode *) node; ClutterRootNode *rnode = (ClutterRootNode *) node;
cogl_push_matrix ();
cogl_framebuffer_set_modelview_matrix (rnode->framebuffer,
&rnode->modelview);
cogl_framebuffer_clear (rnode->framebuffer, cogl_framebuffer_clear (rnode->framebuffer,
rnode->clear_flags, rnode->clear_flags,
&rnode->clear_color); &rnode->clear_color);
@ -129,7 +123,6 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
static void static void
clutter_root_node_post_draw (ClutterPaintNode *node) clutter_root_node_post_draw (ClutterPaintNode *node)
{ {
cogl_pop_matrix ();
} }
static void static void
@ -155,14 +148,12 @@ clutter_root_node_class_init (ClutterRootNodeClass *klass)
static void static void
clutter_root_node_init (ClutterRootNode *self) clutter_root_node_init (ClutterRootNode *self)
{ {
cogl_matrix_init_identity (&self->modelview);
} }
ClutterPaintNode * ClutterPaintNode *
_clutter_root_node_new (CoglFramebuffer *framebuffer, _clutter_root_node_new (CoglFramebuffer *framebuffer,
const ClutterColor *clear_color, const ClutterColor *clear_color,
CoglBufferBit clear_flags, CoglBufferBit clear_flags)
const CoglMatrix *matrix)
{ {
ClutterRootNode *res; ClutterRootNode *res;
@ -177,7 +168,6 @@ _clutter_root_node_new (CoglFramebuffer *framebuffer,
res->framebuffer = cogl_object_ref (framebuffer); res->framebuffer = cogl_object_ref (framebuffer);
res->clear_flags = clear_flags; res->clear_flags = clear_flags;
res->modelview = *matrix;
return (ClutterPaintNode *) res; return (ClutterPaintNode *) res;
} }