isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add PaintNode, an element on the render object tree

Browse Source 
Now that we have a proper scene graph API, we should split out the
rendering part from the logical and event handling part.

ClutterPaintNode is a lightweight fundamental type that encodes only the
paint operations: pipeline state and geometry. At its most simple, is a
way to structure setting up the programmable pipeline using a
CoglPipeline, and submitting Cogl primitives. The important take away
from this API is that you are not allowed to call Cogl API like
cogl_set_source() or cogl_primitive_draw() directly.

The interesting approach to this is that, in the future, we should be
able to move to a purely retained mode: we will decide which actors need
to be painted, they will update their own branch of the render graph,
and we'll take the render graph and build all the rendering commands
from that.

For the 1.x API, we will have to maintain invariants and the existing
behaviour, but as soon as we can break API, the old paint signal will
just go away, and Actors will only be allowed to manipulate the render
tree.
This commit is contained in:
Emmanuele Bassi 2012-02-01 15:51:27 +00:00
parent 696017edf2
commit b83dc6abfa
8 changed files with 2640 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/Makefile.am
View File

@ -100,6 +100,8 @@ source_h = \
$(srcdir)/clutter-model.h \ $(srcdir)/clutter-model.h \
$(srcdir)/clutter-offscreen-effect.h \ $(srcdir)/clutter-offscreen-effect.h \
$(srcdir)/clutter-page-turn-effect.h \ $(srcdir)/clutter-page-turn-effect.h \
$(srcdir)/clutter-paint-nodes.h \
$(srcdir)/clutter-paint-node.h \
$(srcdir)/clutter-path-constraint.h \ $(srcdir)/clutter-path-constraint.h \
$(srcdir)/clutter-path.h \ $(srcdir)/clutter-path.h \
$(srcdir)/clutter-property-transition.h \ $(srcdir)/clutter-property-transition.h \
@ -173,6 +175,8 @@ source_c = \
$(srcdir)/clutter-model.c \ $(srcdir)/clutter-model.c \
$(srcdir)/clutter-offscreen-effect.c \ $(srcdir)/clutter-offscreen-effect.c \
$(srcdir)/clutter-page-turn-effect.c \ $(srcdir)/clutter-page-turn-effect.c \
$(srcdir)/clutter-paint-nodes.c \
$(srcdir)/clutter-paint-node.c \
$(srcdir)/clutter-path-constraint.c \ $(srcdir)/clutter-path-constraint.c \
$(srcdir)/clutter-path.c \ $(srcdir)/clutter-path.c \
$(srcdir)/clutter-property-transition.c \ $(srcdir)/clutter-property-transition.c \
@ -216,6 +220,7 @@ source_h_priv = \
$(srcdir)/clutter-master-clock.h \ $(srcdir)/clutter-master-clock.h \
$(srcdir)/clutter-model-private.h \ $(srcdir)/clutter-model-private.h \
$(srcdir)/clutter-offscreen-effect-private.h \ $(srcdir)/clutter-offscreen-effect-private.h \
$(srcdir)/clutter-paint-node-private.h \
$(srcdir)/clutter-paint-volume-private.h \ $(srcdir)/clutter-paint-volume-private.h \
$(srcdir)/clutter-private.h \ $(srcdir)/clutter-private.h \
$(srcdir)/clutter-profile.h \ $(srcdir)/clutter-profile.h \

115
clutter/clutter-paint-node-private.h Normal file
View File

@ -0,0 +1,115 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Copyright (C) 2011 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
*/
#ifndef __CLUTTER_PAINT_NODE_PRIVATE_H__
#define __CLUTTER_PAINT_NODE_PRIVATE_H__
#include <glib-object.h>
#include <clutter/clutter-paint-node.h>
G_BEGIN_DECLS
#define CLUTTER_PAINT_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_PAINT_NODE, ClutterPaintNodeClass))
#define CLUTTER_IS_PAINT_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_PAINT_NODE))
#define CLUTTER_PAINT_NODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_PAINT_NODE, ClutterPaintNodeClass))
typedef struct _ClutterPaintOperation ClutterPaintOperation;
struct _ClutterPaintNode
{
GTypeInstance parent_instance;
ClutterPaintNode *parent;
ClutterPaintNode *first_child;
ClutterPaintNode *prev_sibling;
ClutterPaintNode *next_sibling;
ClutterPaintNode *last_child;
guint n_children;
GArray *operations;
gchar *name;
volatile int ref_count;
};
struct _ClutterPaintNodeClass
{
GTypeClass base_class;
void (* finalize) (ClutterPaintNode *node);
gboolean (* pre_draw) (ClutterPaintNode *node);
void (* draw) (ClutterPaintNode *node);
void (* post_draw) (ClutterPaintNode *node);
};
typedef enum {
PAINT_OP_INVALID = 0,
PAINT_OP_TEX_RECT,
PAINT_OP_PATH,
PAINT_OP_PRIMITIVE
} PaintOpCode;
struct _ClutterPaintOperation
{
PaintOpCode opcode;
union {
float texrect[8];
CoglPath *path;
CoglPrimitive *primitive;
} op;
};
GType _clutter_root_node_get_type (void) G_GNUC_CONST;
GType _clutter_transform_node_get_type (void) G_GNUC_CONST;
GType _clutter_dummy_node_get_type (void) G_GNUC_CONST;
void _clutter_paint_operation_paint_rectangle (const ClutterPaintOperation *op);
void _clutter_paint_operation_clip_rectangle (const ClutterPaintOperation *op);
void _clutter_paint_operation_paint_path (const ClutterPaintOperation *op);
void _clutter_paint_operation_clip_path (const ClutterPaintOperation *op);
void _clutter_paint_operation_paint_primitive (const ClutterPaintOperation *op);
void _clutter_paint_node_init_types (void);
gpointer _clutter_paint_node_internal (GType gtype);
ClutterPaintNode * _clutter_root_node_new (CoglFramebuffer *framebuffer,
const ClutterColor *clear_color,
CoglBufferBit clear_flags,
const CoglMatrix *matrix);
ClutterPaintNode * _clutter_transform_node_new (const CoglMatrix *matrix);
ClutterPaintNode * _clutter_dummy_node_new (void);
void _clutter_paint_node_paint (ClutterPaintNode *root);
void _clutter_paint_node_dump_tree (ClutterPaintNode *root);
G_END_DECLS
#endif /* __CLUTTER_PAINT_NODE_PRIVATE_H__ */

1137
clutter/clutter-paint-node.c Normal file
View File

File diff suppressed because it is too large Load Diff

95
clutter/clutter-paint-node.h Normal file
View File

@ -0,0 +1,95 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Copyright (C) 2011 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
*/
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_PAINT_NODE_H__
#define __CLUTTER_PAINT_NODE_H__
#include <cogl/cogl.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
#define CLUTTER_TYPE_PAINT_NODE (clutter_paint_node_get_type ())
#define CLUTTER_PAINT_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_PAINT_NODE, ClutterPaintNode))
#define CLUTTER_IS_PAINT_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_PAINT_NODE))
typedef struct _ClutterPaintNodePrivate ClutterPaintNodePrivate;
typedef struct _ClutterPaintNodeClass ClutterPaintNodeClass;
GType clutter_paint_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_paint_node_ref (ClutterPaintNode *node);
void clutter_paint_node_unref (ClutterPaintNode *node);
void clutter_paint_node_set_name (ClutterPaintNode *node,
const char *name);
void clutter_paint_node_add_child (ClutterPaintNode *node,
ClutterPaintNode *child);
void clutter_paint_node_remove_child (ClutterPaintNode *node,
ClutterPaintNode *child);
void clutter_paint_node_replace_child (ClutterPaintNode *node,
ClutterPaintNode *old_child,
ClutterPaintNode *new_child);
void clutter_paint_node_remove_all (ClutterPaintNode *node);
guint clutter_paint_node_get_n_children (ClutterPaintNode *node);
ClutterPaintNode * clutter_paint_node_get_first_child (ClutterPaintNode *node);
ClutterPaintNode * clutter_paint_node_get_previous_sibling (ClutterPaintNode *node);
ClutterPaintNode * clutter_paint_node_get_next_sibling (ClutterPaintNode *node);
ClutterPaintNode * clutter_paint_node_get_last_child (ClutterPaintNode *node);
ClutterPaintNode * clutter_paint_node_get_parent (ClutterPaintNode *node);
void clutter_paint_node_add_rectangle (ClutterPaintNode *node,
const ClutterActorBox *rect);
void clutter_paint_node_add_texture_rectangle (ClutterPaintNode *node,
const ClutterActorBox *rect,
float x_1,
float y_1,
float x_2,
float y_2);
#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
void clutter_paint_node_add_path (ClutterPaintNode *node,
CoglPath *path);
void clutter_paint_node_add_primitive (ClutterPaintNode *node,
CoglPrimitive *primitive);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
#define CLUTTER_VALUE_HOLDS_PAINT_NODE(value) (G_VALUE_HOLDS (value, CLUTTER_TYPE_PAINT_NODE))
void clutter_value_set_paint_node (GValue *value,
gpointer node);
void clutter_value_take_paint_node (GValue *value,
gpointer node);
gpointer clutter_value_get_paint_node (const GValue *value);
gpointer clutter_value_dup_paint_node (const GValue *value);
G_END_DECLS
#endif /* __CLUTTER_PAINT_NODE_H__ */

1124
clutter/clutter-paint-nodes.c Normal file
View File

File diff suppressed because it is too large Load Diff

161
clutter/clutter-paint-nodes.h Normal file
View File

@ -0,0 +1,161 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Copyright (C) 2011 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
*/
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_PAINT_NODES_H__
#define __CLUTTER_PAINT_NODES_H__
#include <cogl/cogl.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
#define CLUTTER_TYPE_COLOR_NODE (clutter_color_node_get_type ())
#define CLUTTER_COLOR_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_COLOR_NODE, ClutterColorNode))
#define CLUTTER_IS_COLOR_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_COLOR_NODE))
/**
* ClutterColorNode:
*
* The <structname>ClutterTextNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterColorNode ClutterColorNode;
typedef struct _ClutterColorNodeClass ClutterColorNodeClass;
GType clutter_color_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_color_node_new (const ClutterColor *color);
#define CLUTTER_TYPE_TEXTURE_NODE (clutter_texture_node_get_type ())
#define CLUTTER_TEXTURE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXTURE_NODE, ClutterTextureNode))
#define CLUTTER_IS_TEXTURE_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TEXTURE_NODE))
/**
* ClutterTextureNode:
*
* The <structname>ClutterTextNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterTextureNode ClutterTextureNode;
typedef struct _ClutterTextureNodeClass ClutterTextureNodeClass;
GType clutter_texture_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_texture_node_new (CoglTexture *texture,
const ClutterColor *color);
#define CLUTTER_TYPE_CLIP_NODE (clutter_clip_node_get_type ())
#define CLUTTER_CLIP_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CLIP_NODE, ClutterClipNode))
#define CLUTTER_IS_CLIP_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CLIP_NODE))
/**
* ClutterClipNode:
*
* The <structname>ClutterTextNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterClipNode ClutterClipNode;
typedef struct _ClutterClipNodeClass ClutterClipNodeClass;
GType clutter_clip_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_clip_node_new (void);
#define CLUTTER_TYPE_PIPELINE_NODE (clutter_pipeline_node_get_type ())
#define CLUTTER_PIPELINE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_PIPELINE_NODE, ClutterPipelineNode))
#define CLUTTER_IS_PIPELINE_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_PIPELINE_NODE))
/**
* ClutterPipelineNode:
*
* The <structname>ClutterTextNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterPipelineNode ClutterPipelineNode;
typedef struct _ClutterPipelineNodeClass ClutterPipelineNodeClass;
GType clutter_pipeline_node_get_type (void) G_GNUC_CONST;
#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline *pipeline);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
#define CLUTTER_TYPE_TEXT_NODE (clutter_text_node_get_type ())
#define CLUTTER_TEXT_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXT_NODE, ClutterTextNode))
#define CLUTTER_IS_TEXT_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TEXT_NODE))
/**
* ClutterTextNode:
*
* The <structname>ClutterTextNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterTextNode ClutterTextNode;
typedef struct _ClutterTextNodeClass ClutterTextNodeClass;
GType clutter_text_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_text_node_new (PangoLayout *layout,
const ClutterColor *color);
#define CLUTTER_TYPE_LAYER_NODE (clutter_layer_node_get_type ())
#define CLUTTER_LAYER_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_LAYER_NODE, ClutterLayerNode))
#define CLUTTER_IS_LAYER_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_LAYER_NODE))
/**
* ClutterLayerNode:
*
* The <structname>ClutterLayerNode</structname> structure is an opaque
* type whose members cannot be directly accessed.
*
* Since: 1.10
*/
typedef struct _ClutterLayerNode ClutterLayerNode;
typedef struct _ClutterLayerNodeClass ClutterLayerNodeClass;
GType clutter_layer_node_get_type (void) G_GNUC_CONST;
ClutterPaintNode * clutter_layer_node_new (const CoglMatrix *projection,
const cairo_rectangle_t *viewport,
float width,
float height,
guint8 opacity);
G_END_DECLS
#endif /* __CLUTTER_PAINT_NODES_H__ */

1
clutter/clutter-types.h
View File

@ -53,6 +53,7 @@ typedef struct _ClutterLayoutMeta ClutterLayoutMeta;
typedef struct _ClutterActorMeta ClutterActorMeta; typedef struct _ClutterActorMeta ClutterActorMeta;
typedef struct _ClutterLayoutManager ClutterLayoutManager; typedef struct _ClutterLayoutManager ClutterLayoutManager;
typedef struct _ClutterActorIter ClutterActorIter; typedef struct _ClutterActorIter ClutterActorIter;
typedef struct _ClutterPaintNode ClutterPaintNode;
typedef struct _ClutterAlpha ClutterAlpha; typedef struct _ClutterAlpha ClutterAlpha;
typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */ typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */

2
clutter/clutter.h
View File

@ -80,6 +80,8 @@
#include "clutter-model.h" #include "clutter-model.h"
#include "clutter-offscreen-effect.h" #include "clutter-offscreen-effect.h"
#include "clutter-page-turn-effect.h" #include "clutter-page-turn-effect.h"
#include "clutter-paint-nodes.h"
#include "clutter-paint-node.h"
#include "clutter-path-constraint.h" #include "clutter-path-constraint.h"
#include "clutter-path.h" #include "clutter-path.h"
#include "clutter-property-transition.h" #include "clutter-property-transition.h"