[clutter/clutter-1.16] paint-nodes: Remove modelview from ClutterRootNode

[Emmanuele Bassi <ebassi src gnome org>]

commit 1d9e2640512067043357456f0298c4798195e167
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Jul 21 00:47:15 2013 +0100

    paint-nodes: Remove modelview from ClutterRootNode
    
    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

 clutter/clutter-paint-node-private.h |    3 +--
 clutter/clutter-paint-nodes.c        |   12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/clutter/clutter-paint-node-private.h b/clutter/clutter-paint-node-private.h
index b91187f..caa9dfc 100644
--- a/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter-paint-node-private.h
@@ -107,8 +107,7 @@ gpointer                _clutter_paint_node_create                      (GType g
 
 ClutterPaintNode *      _clutter_root_node_new                          (CoglFramebuffer             
*framebuffer,
                                                                          const ClutterColor          
*clear_color,
-                                                                         CoglBufferBit                
clear_flags,
-                                                                         const CoglMatrix            
*matrix);
+                                                                         CoglBufferBit                
clear_flags);
 ClutterPaintNode *      _clutter_transform_node_new                     (const CoglMatrix            
*matrix);
 ClutterPaintNode *      _clutter_dummy_node_new                         (ClutterActor                *actor);
 
diff --git a/clutter/clutter-paint-nodes.c b/clutter/clutter-paint-nodes.c
index a03a0cb..91bc91b 100644
--- a/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter-paint-nodes.c
@@ -104,7 +104,6 @@ struct _ClutterRootNode
 
   CoglBufferBit clear_flags;
   CoglColor clear_color;
-  CoglMatrix modelview;
 };
 
 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;
 
-  cogl_push_matrix ();
-
-  cogl_framebuffer_set_modelview_matrix (rnode->framebuffer,
-                                         &rnode->modelview);
-
   cogl_framebuffer_clear (rnode->framebuffer,
                           rnode->clear_flags,
                           &rnode->clear_color);
@@ -129,7 +123,6 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
 static void
 clutter_root_node_post_draw (ClutterPaintNode *node)
 {
-  cogl_pop_matrix ();
 }
 
 static void
@@ -155,14 +148,12 @@ clutter_root_node_class_init (ClutterRootNodeClass *klass)
 static void
 clutter_root_node_init (ClutterRootNode *self)
 {
-  cogl_matrix_init_identity (&self->modelview);
 }
 
 ClutterPaintNode *
 _clutter_root_node_new (CoglFramebuffer    *framebuffer,
                         const ClutterColor *clear_color,
-                        CoglBufferBit       clear_flags,
-                        const CoglMatrix   *matrix)
+                        CoglBufferBit       clear_flags)
 {
   ClutterRootNode *res;
 
@@ -177,7 +168,6 @@ _clutter_root_node_new (CoglFramebuffer    *framebuffer,
 
   res->framebuffer = cogl_object_ref (framebuffer);
   res->clear_flags = clear_flags;
-  res->modelview = *matrix;
 
   return (ClutterPaintNode *) res;
 }