From c77c8d6309fe67e76b3a93e2014f538fbd8d585c Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 8 Apr 2023 20:09:40 -0300 Subject: [PATCH] gsk/vulkan: Cosmetics Reorder code to match the order used in shaders. --- gsk/vulkan/gskvulkancolortextpipeline.c | 10 +++++----- gsk/vulkan/gskvulkantextpipeline.c | 10 +++++----- 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; -- 2.30.2