From 7f5504bea4e23a861429bde4c2439ede61a65803 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 14 May 2023 04:15:06 +0200 Subject: [PATCH] vulkan: Set the initial clip rect Instead of rendering unclipped, set the clip region to the extents of the current clip region. --- gsk/vulkan/gskvulkanclip.c | 8 ++++++++ gsk/vulkan/gskvulkanclipprivate.h | 2 ++ gsk/vulkan/gskvulkanrenderpass.c | 18 +++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/gsk/vulkan/gskvulkanclip.c b/gsk/vulkan/gskvulkanclip.c index 55271a0f8b..88d42a9992 100644 --- a/gsk/vulkan/gskvulkanclip.c +++ b/gsk/vulkan/gskvulkanclip.c @@ -13,6 +13,14 @@ gsk_vulkan_clip_init_empty (GskVulkanClip *clip, gsk_rounded_rect_init_from_rect (&clip->rect, rect, 0); } +void +gsk_vulkan_clip_init_rect (GskVulkanClip *clip, + const graphene_rect_t *rect) +{ + clip->type = GSK_VULKAN_CLIP_RECT; + gsk_rounded_rect_init_from_rect (&clip->rect, rect, 0); +} + static void gsk_vulkan_clip_init_copy (GskVulkanClip *self, const GskVulkanClip *src) diff --git a/gsk/vulkan/gskvulkanclipprivate.h b/gsk/vulkan/gskvulkanclipprivate.h index 7220b732ba..b311c07623 100644 --- a/gsk/vulkan/gskvulkanclipprivate.h +++ b/gsk/vulkan/gskvulkanclipprivate.h @@ -36,6 +36,8 @@ struct _GskVulkanClip void gsk_vulkan_clip_init_empty (GskVulkanClip *clip, const graphene_rect_t *rect); +void gsk_vulkan_clip_init_rect (GskVulkanClip *clip, + const graphene_rect_t *rect); gboolean gsk_vulkan_clip_intersect_rect (GskVulkanClip *dest, const GskVulkanClip *src, diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index 223ee00e78..dcf36ae28a 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -1087,6 +1087,23 @@ gsk_vulkan_render_pass_add (GskVulkanRenderPass *self, GskRenderNode *node) { GskVulkanParseState state; + cairo_rectangle_int_t rect; + graphene_rect_t clip; + + cairo_region_get_extents (self->clip, &rect); + clip = GRAPHENE_RECT_INIT(rect.x + self->viewport.origin.x, + rect.y + self->viewport.origin.y, + rect.width, rect.height); + if (graphene_rect_equal (&clip, &self->viewport)) + { + graphene_rect_scale (&clip, 1 / graphene_vec2_get_x (&self->scale), 1 / graphene_vec2_get_y (&self->scale), &clip); + gsk_vulkan_clip_init_empty (&state.clip, &self->viewport); + } + else + { + graphene_rect_scale (&clip, 1 / graphene_vec2_get_x (&self->scale), 1 / graphene_vec2_get_y (&self->scale), &clip); + gsk_vulkan_clip_init_rect (&state.clip, &clip); + } state.modelview = NULL; graphene_matrix_init_ortho (&state.projection, @@ -1094,7 +1111,6 @@ gsk_vulkan_render_pass_add (GskVulkanRenderPass *self, self->viewport.origin.y, self->viewport.origin.y + self->viewport.size.height, 2 * ORTHO_NEAR_PLANE - ORTHO_FAR_PLANE, ORTHO_FAR_PLANE); - gsk_vulkan_clip_init_empty (&state.clip, &self->viewport); graphene_vec2_init_from_vec2 (&state.scale, &self->scale); state.offset = *graphene_point_zero (); -- 2.30.2