summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2020-11-01 12:27:59 +0100
committerMatthias Clasen <mclasen@redhat.com>2020-11-02 14:55:14 -0500
commit82ca65956fd84873ec3d1e79259dda9ceb8be999 (patch)
tree29e2acb67c4b5d51ec5c60d785b2e95f23c44a65
parentc8c2106f3ed6c642aa0da68f4bc135fc9377660c (diff)
downloadgtk+-82ca65956fd84873ec3d1e79259dda9ceb8be999.tar.gz
gl renderer: Make debugging code shorter
-rw-r--r--gsk/gl/gskglrenderer.c48
1 files changed, 14 insertions, 34 deletions
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index d02e007e76..a40df3c94e 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -581,28 +581,7 @@ init_shader_builder (GskGLRenderer *self,
}
}
-static void G_GNUC_UNUSED
-add_rect_ops (RenderOpBuilder *builder,
- const graphene_rect_t *r)
-{
- const float min_x = r->origin.x;
- const float min_y = r->origin.y;
- const float max_x = min_x + r->size.width;
- const float max_y = min_y + r->size.height;
-
- ops_draw (builder, (GskQuadVertex[GL_N_VERTICES]) {
- { { min_x, min_y }, { 0, 1 }, },
- { { min_x, max_y }, { 0, 0 }, },
- { { max_x, min_y }, { 1, 1 }, },
-
- { { max_x, max_y }, { 1, 0 }, },
- { { min_x, max_y }, { 0, 0 }, },
- { { max_x, min_y }, { 1, 1 }, },
- });
-}
-
static GdkRGBA BLACK = {0, 0, 0, 1};
-
static void G_GNUC_UNUSED
add_rect_outline_ops (GskGLRenderer *self,
RenderOpBuilder *builder,
@@ -611,19 +590,20 @@ add_rect_outline_ops (GskGLRenderer *self,
ops_set_program (builder, &self->programs->color_program);
ops_set_color (builder, &BLACK);
- add_rect_ops (builder,
- &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y,
- 1, rect->size.height));
- add_rect_ops (builder,
- &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y,
- rect->size.width, 1));
- add_rect_ops (builder,
- &GRAPHENE_RECT_INIT (rect->origin.x + rect->size.width - 1, rect->origin.y,
- 1, rect->size.height));
-
- add_rect_ops (builder,
- &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y + rect->size.height - 1,
- rect->size.width, 1));
+ load_vertex_data (ops_draw (builder, NULL),
+ &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y, 1, rect->size.height),
+ builder);
+ load_vertex_data (ops_draw (builder, NULL),
+ &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y, rect->size.width, 1),
+ builder);
+ load_vertex_data (ops_draw (builder, NULL),
+ &GRAPHENE_RECT_INIT (rect->origin.x + rect->size.width - 1,rect->origin.y,
+ 1, rect->size.height),
+ builder);
+ load_vertex_data (ops_draw (builder, NULL),
+ &GRAPHENE_RECT_INIT (rect->origin.x, rect->origin.y + rect->size.height - 1,
+ rect->size.width, 1),
+ builder);
}
static inline GskRoundedRect