vulkan: Bind descriptor sets early

Simplfies the code and doesn't change anything.

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index 0ba33971e7b09703b54b2ff2c8616c8ea86c2e90..f4e41fe407d1de33c3a4f66b9737f8c1a258e457 100644 (file)
--- 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 00783b5a21011f782301d4454e10b77ed2f39eea..beb162bb85b50cc1feb3051c5ee159e326e10344 100644 (file)
--- 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 603f57b2418ea03a1cfa214f5ea9d647bf8978f5..728a606c4e000b5ae5503af94c3aa15a28a9d25d 100644 (file)
--- 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,