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

clutter/paint-node: Rename multitex_coords to coords

Browse Source 
The array will be used not only for multitexture, but also for
multirectangle operations. Rename it to be generic enough to
cover both cases.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1637>
This commit is contained in:
Georges Basile Stavracas Neto 2020-12-14 11:09:52 -03:00 committed by Marge Bot
parent d717cc9231
commit 2cef2b6b1e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ struct _ClutterPaintOperation
{
PaintOpCode opcode;
GArray *multitex_coords;
GArray *coords;
union {
float texrect[8];

11
clutter/clutter/clutter-paint-node.c
View File

@ -778,8 +778,7 @@ clutter_paint_operation_clear (ClutterPaintOperation *op)
break;
case PAINT_OP_MULTITEX_RECT:
if (op->multitex_coords != NULL)
g_array_unref (op->multitex_coords);
g_clear_pointer (&op->coords, g_array_unref);
break;
case PAINT_OP_PRIMITIVE:
@ -819,11 +818,11 @@ clutter_paint_op_init_multitex_rect (ClutterPaintOperation *op,
clutter_paint_operation_clear (op);
op->opcode = PAINT_OP_MULTITEX_RECT;
op->multitex_coords = g_array_sized_new (FALSE, FALSE,
op->coords = g_array_sized_new (FALSE, FALSE,
sizeof (float),
tex_coords_len);
g_array_append_vals (op->multitex_coords, tex_coords, tex_coords_len);
g_array_append_vals (op->coords, tex_coords, tex_coords_len);
op->op.texrect[0] = rect->x1;
op->op.texrect[1] = rect->y1;
@ -1062,9 +1061,9 @@ clutter_paint_node_to_json (ClutterPaintNode *node)
json_builder_set_member_name (builder, "texrect");
json_builder_begin_array (builder);
for (j = 0; i < op->multitex_coords->len; j++)
for (j = 0; i < op->coords->len; j++)
{
float coord = g_array_index (op->multitex_coords, float, j);
float coord = g_array_index (op->coords, float, j);
json_builder_add_double_value (builder, coord);
}

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

@ -474,8 +474,8 @@ clutter_pipeline_node_draw (ClutterPaintNode *node,
op->op.texrect[1],
op->op.texrect[2],
op->op.texrect[3],
(float*) op->multitex_coords->data,
op->multitex_coords->len);
(float *) op->coords->data,
op->coords->len);
break;
case PAINT_OP_PRIMITIVE:
@ -1447,8 +1447,8 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
op->op.texrect[1],
op->op.texrect[2],
op->op.texrect[3],
(float*) op->multitex_coords->data,
op->multitex_coords->len);
(float *) op->coords->data,
op->coords->len);
break;
case PAINT_OP_PRIMITIVE: