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

clutter/layer-node: Rename CoglPipeline field to 'pipeline'

Browse Source 
So it clearly reads what it actually is.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1167
This commit is contained in:
Georges Basile Stavracas Neto 2020-03-30 21:40:31 -03:00
parent 5f5ce08ba4
commit 5817779656
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,7 +1242,7 @@ struct _ClutterLayerNode
float fbo_width; float fbo_width;
float fbo_height; float fbo_height;
CoglPipeline *state; CoglPipeline *pipeline;
CoglFramebuffer *offscreen; CoglFramebuffer *offscreen;
CoglTexture *texture; CoglTexture *texture;
@ -1334,7 +1334,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
case PAINT_OP_TEX_RECT: case PAINT_OP_TEX_RECT:
/* now we need to paint the texture */ /* now we need to paint the texture */
cogl_framebuffer_draw_textured_rectangle (fb, cogl_framebuffer_draw_textured_rectangle (fb,
lnode->state, lnode->pipeline,
op->op.texrect[0], op->op.texrect[0],
op->op.texrect[1], op->op.texrect[1],
op->op.texrect[2], op->op.texrect[2],
@ -1347,7 +1347,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
case PAINT_OP_MULTITEX_RECT: case PAINT_OP_MULTITEX_RECT:
cogl_framebuffer_draw_multitextured_rectangle (fb, cogl_framebuffer_draw_multitextured_rectangle (fb,
lnode->state, lnode->pipeline,
op->op.texrect[0], op->op.texrect[0],
op->op.texrect[1], op->op.texrect[1],
op->op.texrect[2], op->op.texrect[2],
@ -1357,11 +1357,13 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
break; break;
case PAINT_OP_PATH: 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; break;
case PAINT_OP_PRIMITIVE: 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; break;
} }
} }
@ -1372,8 +1374,8 @@ clutter_layer_node_finalize (ClutterPaintNode *node)
{ {
ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node); ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node);
if (lnode->state != NULL) if (lnode->pipeline != NULL)
cogl_object_unref (lnode->state); cogl_object_unref (lnode->pipeline);
if (lnode->offscreen != NULL) if (lnode->offscreen != NULL)
cogl_object_unref (lnode->offscreen); cogl_object_unref (lnode->offscreen);
@ -1458,12 +1460,12 @@ clutter_layer_node_new (const CoglMatrix *projection,
* interpolation filters because the texture is always * interpolation filters because the texture is always
* going to be painted at a 1:1 texel:pixel ratio * going to be painted at a 1:1 texel:pixel ratio
*/ */
res->state = cogl_pipeline_copy (default_texture_pipeline); res->pipeline = cogl_pipeline_copy (default_texture_pipeline);
cogl_pipeline_set_layer_filters (res->state, 0, cogl_pipeline_set_layer_filters (res->pipeline, 0,
COGL_PIPELINE_FILTER_NEAREST, COGL_PIPELINE_FILTER_NEAREST,
COGL_PIPELINE_FILTER_NEAREST); COGL_PIPELINE_FILTER_NEAREST);
cogl_pipeline_set_layer_texture (res->state, 0, res->texture); cogl_pipeline_set_layer_texture (res->pipeline, 0, res->texture);
cogl_pipeline_set_color (res->state, &color); cogl_pipeline_set_color (res->pipeline, &color);
cogl_object_unref (res->texture); cogl_object_unref (res->texture);
out: out: