[mutter/gbsneto/layer-node-cleanups: 8/12] clutter/layer-node: Rename CoglPipeline field to 'pipeline'
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/layer-node-cleanups: 8/12] clutter/layer-node: Rename CoglPipeline field to 'pipeline'
- Date: Thu, 2 Apr 2020 18:51:05 +0000 (UTC)
commit 5817779656ceb7acb05ec0602a8d4b37eadd7b85
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Mar 30 21:40:31 2020 -0300
clutter/layer-node: Rename CoglPipeline field to 'pipeline'
So it clearly reads what it actually is.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1167
clutter/clutter/clutter-paint-nodes.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 5cc8fb3ae..ab3c4b186 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -1242,7 +1242,7 @@ struct _ClutterLayerNode
float fbo_width;
float fbo_height;
- CoglPipeline *state;
+ CoglPipeline *pipeline;
CoglFramebuffer *offscreen;
CoglTexture *texture;
@@ -1334,7 +1334,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
case PAINT_OP_TEX_RECT:
/* now we need to paint the texture */
cogl_framebuffer_draw_textured_rectangle (fb,
- lnode->state,
+ lnode->pipeline,
op->op.texrect[0],
op->op.texrect[1],
op->op.texrect[2],
@@ -1347,7 +1347,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
case PAINT_OP_MULTITEX_RECT:
cogl_framebuffer_draw_multitextured_rectangle (fb,
- lnode->state,
+ lnode->pipeline,
op->op.texrect[0],
op->op.texrect[1],
op->op.texrect[2],
@@ -1357,11 +1357,13 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
break;
case PAINT_OP_PATH:
- cogl_framebuffer_fill_path (fb, lnode->state, op->op.path);
+ cogl_framebuffer_fill_path (fb, lnode->pipeline, op->op.path);
break;
case PAINT_OP_PRIMITIVE:
- cogl_framebuffer_draw_primitive (fb, lnode->state, op->op.primitive);
+ cogl_framebuffer_draw_primitive (fb,
+ lnode->pipeline,
+ op->op.primitive);
break;
}
}
@@ -1372,8 +1374,8 @@ clutter_layer_node_finalize (ClutterPaintNode *node)
{
ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node);
- if (lnode->state != NULL)
- cogl_object_unref (lnode->state);
+ if (lnode->pipeline != NULL)
+ cogl_object_unref (lnode->pipeline);
if (lnode->offscreen != NULL)
cogl_object_unref (lnode->offscreen);
@@ -1458,12 +1460,12 @@ clutter_layer_node_new (const CoglMatrix *projection,
* interpolation filters because the texture is always
* going to be painted at a 1:1 texel:pixel ratio
*/
- res->state = cogl_pipeline_copy (default_texture_pipeline);
- cogl_pipeline_set_layer_filters (res->state, 0,
+ res->pipeline = cogl_pipeline_copy (default_texture_pipeline);
+ cogl_pipeline_set_layer_filters (res->pipeline, 0,
COGL_PIPELINE_FILTER_NEAREST,
COGL_PIPELINE_FILTER_NEAREST);
- cogl_pipeline_set_layer_texture (res->state, 0, res->texture);
- cogl_pipeline_set_color (res->state, &color);
+ cogl_pipeline_set_layer_texture (res->pipeline, 0, res->texture);
+ cogl_pipeline_set_color (res->pipeline, &color);
cogl_object_unref (res->texture);
out:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]