From: Benjamin Otte <otte@redhat.com>
Date: Thu, 11 May 2023 23:34:52 +0000 (+0200)
Subject: vulkan: Don't store push constants in RenderOp
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~185^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=94ab11b999e9dfefd7e620c15a5c52e68a6e314f;p=gtk4.git

vulkan: Don't store push constants in RenderOp

Instead, only store the values that are needed.
---

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 2b41fbf002..557582cdb4 100644
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -97,7 +97,8 @@ struct _GskVulkanOpPushConstants
 {
   GskVulkanOpType         type;
   GskRenderNode          *node; /* node that's the source of this op */
-  GskVulkanPushConstants  constants; /* new constants to push */
+  graphene_matrix_t       mvp;
+  GskRoundedRect          clip;
 };
 
 union _GskVulkanOp
@@ -240,7 +241,8 @@ gsk_vulkan_render_pass_append_push_constants (GskVulkanRenderPass          *self
   GskVulkanOp op = {
     .constants.type = GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS,
     .constants.node = node,
-    .constants.constants = *constants
+    .constants.mvp = constants->mvp,
+    .constants.clip = constants->clip.rect
   };
 
   g_array_append_val (self->render_ops, op);
@@ -1506,7 +1508,7 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass  *self,
           break;
 
         case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
-          clip = &op->constants.constants.clip.rect.bounds;
+          clip = &op->constants.clip.bounds;
           break;
 
         default:
@@ -2253,8 +2255,8 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass     *self,
           for (int j = 0; j < layout_count; j++)
             gsk_vulkan_push_constants_push (command_buffer,
                                             pipeline_layout[j],
-                                            &op->constants.constants.mvp,
-                                            &op->constants.constants.clip.rect);
+                                            &op->constants.mvp,
+                                            &op->constants.clip);
 
           break;