From 5b93a32f9040363ce8b27fc85d70e160f9b5a8b2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 10 May 2023 00:17:01 +0200 Subject: [PATCH] vulkan: Remove unneeded argument The initial matrix can be computed as needed, so we don't need to precompute it. --- gsk/vulkan/gskvulkanrender.c | 4 ---- gsk/vulkan/gskvulkanrenderpass.c | 7 +------ gsk/vulkan/gskvulkanrenderpassprivate.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c index 20ee28a218..8fc5bb7776 100644 --- a/gsk/vulkan/gskvulkanrender.c +++ b/gsk/vulkan/gskvulkanrender.c @@ -338,15 +338,11 @@ gsk_vulkan_render_add_node (GskVulkanRender *self, GskRenderNode *node) { GskVulkanRenderPass *pass; - graphene_matrix_t mv; - - graphene_matrix_init_scale (&mv, self->scale, self->scale, 1.0); pass = gsk_vulkan_render_pass_new (self->vulkan, self->target, self->scale, self->scale, - &mv, &self->viewport, self->clip, VK_NULL_HANDLE); diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index ac30272848..47daaced16 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -137,7 +137,6 @@ gsk_vulkan_render_pass_new (GdkVulkanContext *context, GskVulkanImage *target, float scale_x, float scale_y, - graphene_matrix_t *mv, graphene_rect_t *viewport, cairo_region_t *clip, VkSemaphore signal_semaphore) @@ -155,7 +154,7 @@ gsk_vulkan_render_pass_new (GdkVulkanContext *context, self->scale_x = scale_x; self->scale_y = scale_y; - self->mv = *mv; + graphene_matrix_init_scale (&self->mv, self->scale_x, self->scale_y, 1.0); graphene_matrix_init_ortho (&self->p, viewport->origin.x, viewport->origin.x + viewport->size.width, viewport->origin.y, viewport->origin.y + viewport->size.height, @@ -1025,7 +1024,6 @@ gsk_vulkan_render_pass_render_offscreen (GdkVulkanContext *vulkan, graphene_rect_t view; cairo_region_t *clip; GskVulkanRenderPass *pass; - graphene_matrix_t mv; GskVulkanImage *result; view = GRAPHENE_RECT_INIT (viewport->origin.x, @@ -1052,13 +1050,10 @@ gsk_vulkan_render_pass_render_offscreen (GdkVulkanContext *vulkan, gsk_vulkan_image_get_height (result) }); - graphene_matrix_init_identity (&mv); - pass = gsk_vulkan_render_pass_new (vulkan, result, 1, 1, - &mv, &view, clip, semaphore); diff --git a/gsk/vulkan/gskvulkanrenderpassprivate.h b/gsk/vulkan/gskvulkanrenderpassprivate.h index e41418e115..b1a5e90cfc 100644 --- a/gsk/vulkan/gskvulkanrenderpassprivate.h +++ b/gsk/vulkan/gskvulkanrenderpassprivate.h @@ -14,7 +14,6 @@ GskVulkanRenderPass * gsk_vulkan_render_pass_new (GdkVulk GskVulkanImage *target, float scale_x, float scale_y, - graphene_matrix_t *mv, graphene_rect_t *viewport, cairo_region_t *clip, VkSemaphore signal_semaphore);