From d7764cc6b34b6d2480f88d4c6f3eb5c6f4544e67 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 8 Jul 2023 23:16:01 +0200
Subject: [PATCH] vulkan: Bind descriptor sets early

Simplfies the code and doesn't change anything.
---
 gsk/vulkan/gskvulkanrender.c        | 23 +++++++++--------------
 gsk/vulkan/gskvulkanrenderpass.c    |  2 --
 gsk/vulkan/gskvulkanrenderprivate.h |  2 --
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index 0ba33971e7..f4e41fe407 100644
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -569,20 +569,6 @@ gsk_vulkan_render_get_render_pass (GskVulkanRender *self,
   return render_pass;
 }
 
-void
-gsk_vulkan_render_bind_descriptor_sets (GskVulkanRender *self,
-                                        VkCommandBuffer  command_buffer)
-{
-  vkCmdBindDescriptorSets (command_buffer,
-                           VK_PIPELINE_BIND_POINT_GRAPHICS,
-                           self->pipeline_layout,
-                           0,
-                           N_DESCRIPTOR_SETS,
-                           self->descriptor_sets,
-                           0,
-                           NULL);
-}
-
 gsize
 gsk_vulkan_render_get_image_descriptor (GskVulkanRender        *self,
                                         GskVulkanImage         *image,
@@ -778,6 +764,15 @@ gsk_vulkan_render_draw_pass (GskVulkanRender     *self,
                             },
                             (VkDeviceSize[1]) { 0 });
 
+  vkCmdBindDescriptorSets (command_buffer,
+                           VK_PIPELINE_BIND_POINT_GRAPHICS,
+                           self->pipeline_layout,
+                           0,
+                           N_DESCRIPTOR_SETS,
+                           self->descriptor_sets,
+                           0,
+                           NULL);
+
   gsk_vulkan_render_pass_draw (pass, self, self->pipeline_layout, command_buffer);
 
   gsk_vulkan_command_pool_submit_buffer (self->command_pool,
diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 00783b5a21..beb162bb85 100644
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -1472,8 +1472,6 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
                         },
                         VK_SUBPASS_CONTENTS_INLINE);
 
-  gsk_vulkan_render_bind_descriptor_sets (render, command_buffer);
-
   gsk_vulkan_render_pass_draw_rect (self, render, pipeline_layout, command_buffer);
 
   vkCmdEndRenderPass (command_buffer);
diff --git a/gsk/vulkan/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h
index 603f57b241..728a606c4e 100644
--- a/gsk/vulkan/gskvulkanrenderprivate.h
+++ b/gsk/vulkan/gskvulkanrenderprivate.h
@@ -48,8 +48,6 @@ guchar *                gsk_vulkan_render_get_buffer_memory             (GskVulk
                                                                          gsize                   size,
                                                                          gsize                   alignment,
                                                                          gsize                  *out_offset);
-void                    gsk_vulkan_render_bind_descriptor_sets          (GskVulkanRender        *self,
-                                                                         VkCommandBuffer         command_buffer);
 
 void                    gsk_vulkan_render_draw                          (GskVulkanRender        *self);
 void                    gsk_vulkan_render_draw_pass                     (GskVulkanRender        *self,
-- 
2.30.2