vulkan: Split renderpass op into 2

Add an explicit begin() and an end() op. For now, this looks like
overkill, but it allows doing renderpasses with custom ops that are not
meant to render a rendernode.

Examples for this are pre/postprocessing passes or 2-pass blur.

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index e0140fa0c97818386238bbb1cb042d8f8de1987c..b84810cab297f06b55c6187f4dc220f14061475b 100644 (file)
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -491,20 +491,33 @@ gsk_vulkan_render_add_node (GskVulkanRender       *self,
                             GskVulkanDownloadFunc  download_func,
                             gpointer               download_data)
 {
+  GskVulkanRenderPass *render_pass;
   graphene_vec2_t scale;
   cairo_rectangle_int_t extents;
 
   graphene_vec2_init (&scale, self->scale, self->scale);
   cairo_region_get_extents (self->clip, &extents);
 
-  gsk_vulkan_render_pass_op (self,
-                             g_object_ref (self->target),
-                             &extents,
-                             &scale,
-                             &self->viewport,
-                             node,
-                             VK_IMAGE_LAYOUT_UNDEFINED,
-                             VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
+  gsk_vulkan_render_pass_begin_op (self,
+                                   g_object_ref (self->target),
+                                   &extents,
+                                   &self->viewport.size,
+                                   VK_IMAGE_LAYOUT_UNDEFINED,
+                                   VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
+
+
+  render_pass = gsk_vulkan_render_pass_new ();
+  gsk_vulkan_render_pass_add (render_pass,
+                              self,
+                              &scale,
+                              &self->viewport,
+                              &extents,
+                              node);
+  gsk_vulkan_render_pass_free (render_pass);
+
+  gsk_vulkan_render_pass_end_op (self,
+                                 g_object_ref (self->target),
+                                 VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
 
   if (download_func)
     gsk_vulkan_download_op (self, self->target, download_func, download_data);

diff --git a/gsk/vulkan/gskvulkanrenderpassop.c b/gsk/vulkan/gskvulkanrenderpassop.c
index 19bc14d10e506b9e9ad29a23643836d2f782aba1..0a785984d2f7bdd5c506b9499fd36770e478da3a 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpassop.c
+++ b/gsk/vulkan/gskvulkanrenderpassop.c
@@ -241,41 +241,35 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_END_OP_CLASS = {
 };
 
 void
-gsk_vulkan_render_pass_op (GskVulkanRender       *render,
-                           GskVulkanImage        *image,
-                           cairo_rectangle_int_t *area,
-                           const graphene_vec2_t *scale,
-                           const graphene_rect_t *viewport,
-                           GskRenderNode         *node,
-                           VkImageLayout          initial_layout,
-                           VkImageLayout          final_layout)
+gsk_vulkan_render_pass_begin_op (GskVulkanRender             *render,
+                                 GskVulkanImage              *image,
+                                 const cairo_rectangle_int_t *area,
+                                 const graphene_size_t       *viewport_size,
+                                 VkImageLayout                initial_layout,
+                                 VkImageLayout                final_layout)
 {
   GskVulkanRenderPassOp *self;
-  GskVulkanRenderPassEndOp *end;
-  GskVulkanRenderPass *render_pass;
 
   self = (GskVulkanRenderPassOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_RENDER_PASS_OP_CLASS);
 
-  self->image = image;
+  self->image = g_object_ref (image);
   self->initial_layout = initial_layout;
   self->final_layout = final_layout;
   self->area = *area;
-  self->viewport_size = viewport->size;
+  self->viewport_size = *viewport_size;
+}
 
-  render_pass = gsk_vulkan_render_pass_new ();
-  /* This invalidates the self pointer */
-  gsk_vulkan_render_pass_add (render_pass,
-                              render,
-                              scale,
-                              viewport,
-                              area,
-                              node);
-  gsk_vulkan_render_pass_free (render_pass);
+void
+gsk_vulkan_render_pass_end_op (GskVulkanRender *render,
+                               GskVulkanImage  *image,
+                               VkImageLayout    final_layout)
+{
+  GskVulkanRenderPassEndOp *self;
 
-  end = (GskVulkanRenderPassEndOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_RENDER_PASS_END_OP_CLASS);
+  self = (GskVulkanRenderPassEndOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_RENDER_PASS_END_OP_CLASS);
 
-  end->image = g_object_ref (image);
-  end->final_layout = final_layout;
+  self->image = g_object_ref (image);
+  self->final_layout = final_layout;
 }
 
 GskVulkanImage *
@@ -284,6 +278,7 @@ gsk_vulkan_render_pass_op_offscreen (GskVulkanRender       *render,
                                      const graphene_rect_t *viewport,
                                      GskRenderNode         *node)
 {
+  GskVulkanRenderPass *render_pass;
   GdkVulkanContext *context;
   graphene_rect_t view;
   GskVulkanImage *image;
@@ -302,18 +297,33 @@ gsk_vulkan_render_pass_op_offscreen (GskVulkanRender       *render,
                                                   gsk_render_node_get_preferred_depth (node)),
                                               view.size.width, view.size.height);
 
-  gsk_vulkan_render_pass_op (render,
-                             image,
-                             &(cairo_rectangle_int_t) {
-                                 0, 0,
-                                 gsk_vulkan_image_get_width (image),
-                                 gsk_vulkan_image_get_height (image)
-                             },
-                             scale,
-                             &view,
-                             node,
-                             VK_IMAGE_LAYOUT_UNDEFINED,
-                             VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+  gsk_vulkan_render_pass_begin_op (render,
+                                   image,
+                                   &(cairo_rectangle_int_t) {
+                                       0, 0,
+                                       gsk_vulkan_image_get_width (image),
+                                       gsk_vulkan_image_get_height (image)
+                                   },
+                                   &viewport->size,
+                                   VK_IMAGE_LAYOUT_UNDEFINED,
+                                   VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+
+  render_pass = gsk_vulkan_render_pass_new ();
+  gsk_vulkan_render_pass_add (render_pass,
+                              render,
+                              scale,
+                              viewport,
+                              &(cairo_rectangle_int_t) {
+                                  0, 0,
+                                  gsk_vulkan_image_get_width (image),
+                                  gsk_vulkan_image_get_height (image)
+                              },
+                              node);
+  gsk_vulkan_render_pass_free (render_pass);
+
+  gsk_vulkan_render_pass_end_op (render,
+                                 image,
+                                 VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 
   return image;
 }

diff --git a/gsk/vulkan/gskvulkanrenderpassopprivate.h b/gsk/vulkan/gskvulkanrenderpassopprivate.h
index 09aa34b86ede719ced7cd39064fb4dc31c772dfc..ad7b90ddc2e005e7bf352094013aeb81942ef8af 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpassopprivate.h
+++ b/gsk/vulkan/gskvulkanrenderpassopprivate.h
@@ -4,14 +4,17 @@
 
 G_BEGIN_DECLS
 
-void                    gsk_vulkan_render_pass_op                       (GskVulkanRender                *render,
+
+void                    gsk_vulkan_render_pass_begin_op                 (GskVulkanRender                *render,
                                                                          GskVulkanImage                 *image,
-                                                                         cairo_rectangle_int_t          *area,
-                                                                         const graphene_vec2_t          *scale,
-                                                                         const graphene_rect_t          *viewport,
-                                                                         GskRenderNode                  *node,
+                                                                         const cairo_rectangle_int_t    *area,
+                                                                         const graphene_size_t          *viewport_size,
                                                                          VkImageLayout                   initial_layout,
                                                                          VkImageLayout                   final_layout);
+void                    gsk_vulkan_render_pass_end_op                   (GskVulkanRender                *render,
+                                                                         GskVulkanImage                 *image,
+                                                                         VkImageLayout                   final_layout);
+
 GskVulkanImage *        gsk_vulkan_render_pass_op_offscreen             (GskVulkanRender                *render,
                                                                          const graphene_vec2_t          *scale,
                                                                          const graphene_rect_t          *viewport,