[mutter/gbsneto/background-content: 3/4] background-content: Simplify method call
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/background-content: 3/4] background-content: Simplify method call
- Date: Tue, 9 Jun 2020 20:07:38 +0000 (UTC)
commit 6d75b4fc532ade66a2c31ca511deb1bdc8ef3451
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Jun 9 13:02:50 2020 -0300
background-content: Simplify method call
It's always passing the same pipeline and texture rect, simplify
by passing the MetaBackgroundContent instance itself.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1302
src/compositor/meta-background-content.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/src/compositor/meta-background-content.c b/src/compositor/meta-background-content.c
index 37555616f3..1d926ee95b 100644
--- a/src/compositor/meta-background-content.c
+++ b/src/compositor/meta-background-content.c
@@ -442,10 +442,9 @@ set_glsl_parameters (MetaBackgroundContent *self,
}
static void
-paint_clipped_rectangle (ClutterPaintNode *node,
- CoglPipeline *pipeline,
- cairo_rectangle_int_t *rect,
- cairo_rectangle_int_t *texture_area)
+paint_clipped_rectangle (MetaBackgroundContent *self,
+ ClutterPaintNode *node,
+ cairo_rectangle_int_t *rect)
{
g_autoptr (ClutterPaintNode) pipeline_node = NULL;
float x1, y1, x2, y2;
@@ -456,12 +455,12 @@ paint_clipped_rectangle (ClutterPaintNode *node,
x2 = rect->x + rect->width;
y2 = rect->y + rect->height;
- tx1 = (x1 - texture_area->x) / texture_area->width;
- ty1 = (y1 - texture_area->y) / texture_area->height;
- tx2 = (x2 - texture_area->x) / texture_area->width;
- ty2 = (y2 - texture_area->y) / texture_area->height;
+ tx1 = (x1 - self->texture_area.x) / (float)self->texture_area.width;
+ ty1 = (y1 - self->texture_area.y) / (float)self->texture_area.height;
+ tx2 = (x2 - self->texture_area.x) / (float)self->texture_area.width;
+ ty2 = (y2 - self->texture_area.y) / (float)self->texture_area.height;
- pipeline_node = clutter_pipeline_node_new (pipeline);
+ pipeline_node = clutter_pipeline_node_new (self->pipeline);
clutter_paint_node_set_name (pipeline_node, "MetaBackgroundContent (Slice)");
clutter_paint_node_add_texture_rectangle (pipeline_node,
&(ClutterActorBox) {
@@ -531,16 +530,14 @@ meta_background_content_paint_content (ClutterContent *content,
{
cairo_rectangle_int_t rect;
cairo_region_get_rectangle (region, i, &rect);
- paint_clipped_rectangle (node, self->pipeline, &rect,
- &self->texture_area);
+ paint_clipped_rectangle (self, node, &rect);
}
}
else
{
cairo_rectangle_int_t rect;
cairo_region_get_extents (region, &rect);
- paint_clipped_rectangle (node, self->pipeline, &rect,
- &self->texture_area);
+ paint_clipped_rectangle (self, node, &rect);
}
cairo_region_destroy (region);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]