gsk/vulkan: Cosmetics

Reorder code to match the order used in shaders.

diff --git a/gsk/vulkan/gskvulkancolortextpipeline.c b/gsk/vulkan/gskvulkancolortextpipeline.c
index 5ffe62adcc310687dc272e433238700e9ee185b9..295cf53339fa3fe6500075726d720fd64053ffda 100644 (file)
--- 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 9544c6a7c766fd20ce37450a91c30e04b412aa6a..41e40f13954b1c850fd74709dfb88edb64501aac 100644 (file)
--- 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;