summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2023-04-08 20:09:40 -0300
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2023-04-08 20:13:13 -0300
commitc77c8d6309fe67e76b3a93e2014f538fbd8d585c (patch)
tree7be6e7d800149439cdfb35b8aaea5c4714fdb9e0
parent99251c0c8fd98ba7ffb36999a374327b67f27fc3 (diff)
downloadgtk+-c77c8d6309fe67e76b3a93e2014f538fbd8d585c.tar.gz
gsk/vulkan: Cosmetics
Reorder code to match the order used in shaders.
-rw-r--r--gsk/vulkan/gskvulkancolortextpipeline.c10
-rw-r--r--gsk/vulkan/gskvulkantextpipeline.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/gsk/vulkan/gskvulkancolortextpipeline.c b/gsk/vulkan/gskvulkancolortextpipeline.c
index 5ffe62adcc..295cf53339 100644
--- a/gsk/vulkan/gskvulkancolortextpipeline.c
+++ b/gsk/vulkan/gskvulkancolortextpipeline.c
@@ -131,16 +131,16 @@ gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *
gi->geometry.y_offset,
scale);
- instance->tex_rect[0] = glyph->tx;
- instance->tex_rect[1] = glyph->ty;
- instance->tex_rect[2] = glyph->tw;
- instance->tex_rect[3] = glyph->th;
-
instance->rect[0] = offset->x + cx + glyph->draw_x;
instance->rect[1] = offset->y + cy + glyph->draw_y;
instance->rect[2] = glyph->draw_width;
instance->rect[3] = glyph->draw_height;
+ instance->tex_rect[0] = glyph->tx;
+ instance->tex_rect[1] = glyph->ty;
+ instance->tex_rect[2] = glyph->tw;
+ instance->tex_rect[3] = glyph->th;
+
count++;
}
x_position += gi->geometry.width;
diff --git a/gsk/vulkan/gskvulkantextpipeline.c b/gsk/vulkan/gskvulkantextpipeline.c
index 9544c6a7c7..41e40f1395 100644
--- a/gsk/vulkan/gskvulkantextpipeline.c
+++ b/gsk/vulkan/gskvulkantextpipeline.c
@@ -139,16 +139,16 @@ gsk_vulkan_text_pipeline_collect_vertex_data (GskVulkanTextPipeline *pipeline,
gi->geometry.y_offset,
scale);
- instance->tex_rect[0] = glyph->tx;
- instance->tex_rect[1] = glyph->ty;
- instance->tex_rect[2] = glyph->tw;
- instance->tex_rect[3] = glyph->th;
-
instance->rect[0] = offset->x + cx + glyph->draw_x;
instance->rect[1] = offset->y + cy + glyph->draw_y;
instance->rect[2] = glyph->draw_width;
instance->rect[3] = glyph->draw_height;
+ instance->tex_rect[0] = glyph->tx;
+ instance->tex_rect[1] = glyph->ty;
+ instance->tex_rect[2] = glyph->tw;
+ instance->tex_rect[3] = glyph->th;
+
instance->color[0] = color->red;
instance->color[1] = color->green;
instance->color[2] = color->blue;