vulkan: Remove op.get_pipeline()
authorBenjamin Otte <otte@redhat.com>
Mon, 3 Jul 2023 14:14:57 +0000 (16:14 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 16 Jul 2023 10:13:00 +0000 (12:13 +0200)
It's unused now that GskVulkanPipeline is gone.

19 files changed:
gsk/vulkan/gskvulkanblendmodeop.c
gsk/vulkan/gskvulkanblurop.c
gsk/vulkan/gskvulkanborderop.c
gsk/vulkan/gskvulkancolormatrixop.c
gsk/vulkan/gskvulkancolorop.c
gsk/vulkan/gskvulkancrossfadeop.c
gsk/vulkan/gskvulkanglyphop.c
gsk/vulkan/gskvulkaninsetshadowop.c
gsk/vulkan/gskvulkanlineargradientop.c
gsk/vulkan/gskvulkanoffscreenop.c
gsk/vulkan/gskvulkanop.c
gsk/vulkan/gskvulkanopprivate.h
gsk/vulkan/gskvulkanoutsetshadowop.c
gsk/vulkan/gskvulkanpushconstantsop.c
gsk/vulkan/gskvulkanrenderpass.c
gsk/vulkan/gskvulkanscissorop.c
gsk/vulkan/gskvulkantextureop.c
gsk/vulkan/gskvulkanuploadcairoop.c
gsk/vulkan/gskvulkanuploadop.c

index ee50ca26e684f05740d820dc7cb9bbdbe4513756..2556818453208d2d8fdc179126bc30258ca7df5d 100644 (file)
@@ -96,12 +96,6 @@ gsk_vulkan_blend_mode_op_reserve_descriptor_sets (GskVulkanOp     *op,
                                                                           GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static VkPipeline
-gsk_vulkan_blend_mode_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_blend_mode_op_command (GskVulkanOp      *op,
                                   GskVulkanRender  *render,
@@ -124,7 +118,6 @@ static const GskVulkanShaderOpClass GSK_VULKAN_BLEND_MODE_OP_CLASS = {
   gsk_vulkan_blend_mode_op_count_vertex_data,
   gsk_vulkan_blend_mode_op_collect_vertex_data,
   gsk_vulkan_blend_mode_op_reserve_descriptor_sets,
-  gsk_vulkan_blend_mode_op_get_pipeline,
   gsk_vulkan_blend_mode_op_command
 };
 
index df2eb427bf9e8a9f3ff80978a13ea74b98dcc495..97dd5900eed30aa1cb241e4930f0279606bd0a82 100644 (file)
@@ -83,12 +83,6 @@ gsk_vulkan_blur_op_reserve_descriptor_sets (GskVulkanOp     *op,
                                                                    GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static VkPipeline
-gsk_vulkan_blur_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_blur_op_command (GskVulkanOp      *op,
                             GskVulkanRender *render,
@@ -111,7 +105,6 @@ static const GskVulkanOpClass GSK_VULKAN_BLUR_OP_CLASS = {
   gsk_vulkan_blur_op_count_vertex_data,
   gsk_vulkan_blur_op_collect_vertex_data,
   gsk_vulkan_blur_op_reserve_descriptor_sets,
-  gsk_vulkan_blur_op_get_pipeline,
   gsk_vulkan_blur_op_command
 };
 
index 0855ea485d371b6035439c4f49daee42f118c64c..63866265aedb97270af904d7125ac2850bef60de 100644 (file)
@@ -77,12 +77,6 @@ gsk_vulkan_border_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_border_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_border_op_command (GskVulkanOp      *op,
                               GskVulkanRender *render,
@@ -105,7 +99,6 @@ static const GskVulkanOpClass GSK_VULKAN_BORDER_OP_CLASS = {
   gsk_vulkan_border_op_count_vertex_data,
   gsk_vulkan_border_op_collect_vertex_data,
   gsk_vulkan_border_op_reserve_descriptor_sets,
-  gsk_vulkan_border_op_get_pipeline,
   gsk_vulkan_border_op_command
 };
 
index f04e96e9e1c7dfe3e3a861913a7d1904ee90df40..bff05a9127458f12d781fda4ad4e3fbce61d535d 100644 (file)
@@ -91,12 +91,6 @@ gsk_vulkan_color_matrix_op_reserve_descriptor_sets (GskVulkanOp     *op,
                                                                    GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static VkPipeline
-gsk_vulkan_color_matrix_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_color_matrix_op_command (GskVulkanOp      *op,
                                     GskVulkanRender *render,
@@ -119,7 +113,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_MATRIX_OP_CLASS = {
   gsk_vulkan_color_matrix_op_count_vertex_data,
   gsk_vulkan_color_matrix_op_collect_vertex_data,
   gsk_vulkan_color_matrix_op_reserve_descriptor_sets,
-  gsk_vulkan_color_matrix_op_get_pipeline,
   gsk_vulkan_color_matrix_op_command
 };
 
index 5dd4ecc608b9dd08df54d3fa49ce232dd6e14976..6aa3ef6f9bcb0fcc22fda732aaf0f2eeb56fd1fb 100644 (file)
@@ -74,12 +74,6 @@ gsk_vulkan_color_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_color_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_color_op_command (GskVulkanOp      *op,
                              GskVulkanRender  *render,
@@ -102,7 +96,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_OP_CLASS = {
   gsk_vulkan_color_op_count_vertex_data,
   gsk_vulkan_color_op_collect_vertex_data,
   gsk_vulkan_color_op_reserve_descriptor_sets,
-  gsk_vulkan_color_op_get_pipeline,
   gsk_vulkan_color_op_command
 };
 
index 6a229b2281f7bdd77b32160e3d53888708029a7f..d3c66a96f001791212068bf1e7e80f6bcb42c7a4 100644 (file)
@@ -96,12 +96,6 @@ gsk_vulkan_cross_fade_op_reserve_descriptor_sets (GskVulkanOp     *op,
                                                                        GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static VkPipeline
-gsk_vulkan_cross_fade_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_cross_fade_op_command (GskVulkanOp      *op,
                                   GskVulkanRender  *render,
@@ -124,7 +118,6 @@ static const GskVulkanOpClass GSK_VULKAN_CROSS_FADE_OP_CLASS = {
   gsk_vulkan_cross_fade_op_count_vertex_data,
   gsk_vulkan_cross_fade_op_collect_vertex_data,
   gsk_vulkan_cross_fade_op_reserve_descriptor_sets,
-  gsk_vulkan_cross_fade_op_get_pipeline,
   gsk_vulkan_cross_fade_op_command
 };
 
index 8f9b0c3afbb79e29af10da23fae0a671aa2fb622..b18028cd7a54553a7aa3503c64cfe90f723da8d6 100644 (file)
@@ -81,12 +81,6 @@ gsk_vulkan_glyph_op_reserve_descriptor_sets (GskVulkanOp     *op,
   self->image_descriptor = gsk_vulkan_render_get_image_descriptor (render, self->image, GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static VkPipeline
-gsk_vulkan_glyph_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_glyph_op_command (GskVulkanOp      *op,
                              GskVulkanRender  *render,
@@ -109,7 +103,6 @@ static const GskVulkanOpClass GSK_VULKAN_GLYPH_OP_CLASS = {
   gsk_vulkan_glyph_op_count_vertex_data,
   gsk_vulkan_glyph_op_collect_vertex_data,
   gsk_vulkan_glyph_op_reserve_descriptor_sets,
-  gsk_vulkan_glyph_op_get_pipeline,
   gsk_vulkan_glyph_op_command
 };
 
index fa0ceae5039b84fd613199d1e372d7e39f2f2e39..727f9bc3b84563631a92f94cce881ec2b9e6f538 100644 (file)
@@ -77,12 +77,6 @@ gsk_vulkan_inset_shadow_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_inset_shadow_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_inset_shadow_op_command (GskVulkanOp      *op,
                                     GskVulkanRender *render,
@@ -105,7 +99,6 @@ static const GskVulkanOpClass GSK_VULKAN_INSET_SHADOW_OP_CLASS = {
   gsk_vulkan_inset_shadow_op_count_vertex_data,
   gsk_vulkan_inset_shadow_op_collect_vertex_data,
   gsk_vulkan_inset_shadow_op_reserve_descriptor_sets,
-  gsk_vulkan_inset_shadow_op_get_pipeline,
   gsk_vulkan_inset_shadow_op_command
 };
 
index c6803481900ea48ab7adf7478bcfab967b3f468e..8277ee46936b5ef11dcbf6c2db7e9af4b205ba8d 100644 (file)
@@ -90,12 +90,6 @@ gsk_vulkan_linear_gradient_op_reserve_descriptor_sets (GskVulkanOp     *op,
   memcpy (mem, self->stops, self->n_stops * sizeof (GskColorStop));
 }
 
-static VkPipeline
-gsk_vulkan_linear_gradient_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_linear_gradient_op_command (GskVulkanOp      *op,
                                        GskVulkanRender  *render,
@@ -118,7 +112,6 @@ static const GskVulkanOpClass GSK_VULKAN_LINEAR_GRADIENT_OP_CLASS = {
   gsk_vulkan_linear_gradient_op_count_vertex_data,
   gsk_vulkan_linear_gradient_op_collect_vertex_data,
   gsk_vulkan_linear_gradient_op_reserve_descriptor_sets,
-  gsk_vulkan_linear_gradient_op_get_pipeline,
   gsk_vulkan_linear_gradient_op_command
 };
 
index 079f164c059aba14f32f12ae5a00df80b654c73e..5e04c72a2c6ee8ab71a1868aa7149f0b715843e0 100644 (file)
@@ -60,12 +60,6 @@ gsk_vulkan_offscreen_op_reserve_descriptor_sets (GskVulkanOp     *op,
   gsk_vulkan_render_pass_reserve_descriptor_sets (self->render_pass, render);
 }
 
-static VkPipeline
-gsk_vulkan_offscreen_op_get_pipeline (GskVulkanOp *op)
-{
-  return NULL;
-}
-
 static void
 gsk_vulkan_offscreen_op_command (GskVulkanOp      *op,
                                  GskVulkanRender  *render,
@@ -86,7 +80,6 @@ static const GskVulkanOpClass GSK_VULKAN_OFFSCREEN_OP_CLASS = {
   gsk_vulkan_offscreen_op_count_vertex_data,
   gsk_vulkan_offscreen_op_collect_vertex_data,
   gsk_vulkan_offscreen_op_reserve_descriptor_sets,
-  gsk_vulkan_offscreen_op_get_pipeline,
   gsk_vulkan_offscreen_op_command
 };
 
index e626ba51494feef34cb3b1d033afc2b06abfaf5b..4723815b4bd4921d647b276bcb5e1c9581db4762 100644 (file)
@@ -53,12 +53,6 @@ gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp     *op,
   op->op_class->reserve_descriptor_sets (op, render);
 }
 
-VkPipeline
-gsk_vulkan_op_get_pipeline (GskVulkanOp *op)
-{
-  return op->op_class->get_pipeline (op);
-}
-
 void
 gsk_vulkan_op_command (GskVulkanOp      *op,
                        GskVulkanRender  *render,
index 1d1a7bbdb133a8014c206807927d418502cf0404..3f49dd49ec31a581d5df197b349ed7552468f2f5 100644 (file)
@@ -37,7 +37,6 @@ struct _GskVulkanOpClass
                                                                          guchar                 *data);
   void                  (* reserve_descriptor_sets)                     (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);
-  VkPipeline            (* get_pipeline)                                (GskVulkanOp            *op);
   void                  (* command)                                     (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render,
                                                                          VkPipelineLayout        pipeline_layout,
@@ -63,7 +62,6 @@ void                    gsk_vulkan_op_collect_vertex_data               (GskVulk
                                                                          guchar                 *data);
 void                    gsk_vulkan_op_reserve_descriptor_sets           (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);
-VkPipeline              gsk_vulkan_op_get_pipeline                      (GskVulkanOp            *op);
 void                    gsk_vulkan_op_command                           (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render,
                                                                          VkPipelineLayout        pipeline_layout,
index 0cb29cc2e3ac8e59a2716987248338df5b9011f7..1fbd745591607caa55574c4b270120303fc4d09b 100644 (file)
@@ -77,12 +77,6 @@ gsk_vulkan_outset_shadow_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_outset_shadow_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_outset_shadow_op_command (GskVulkanOp      *op,
                                      GskVulkanRender *render,
@@ -105,7 +99,6 @@ static const GskVulkanOpClass GSK_VULKAN_OUTSET_SHADOW_OP_CLASS = {
   gsk_vulkan_outset_shadow_op_count_vertex_data,
   gsk_vulkan_outset_shadow_op_collect_vertex_data,
   gsk_vulkan_outset_shadow_op_reserve_descriptor_sets,
-  gsk_vulkan_outset_shadow_op_get_pipeline,
   gsk_vulkan_outset_shadow_op_command
 };
 
index 126d9eb142f498e3f6b60e0ec3bcbecf8e0e2b31..ddab7a12668b6eabd1a259e332d8352ad8f9f9b7 100644 (file)
@@ -75,12 +75,6 @@ gsk_vulkan_push_constants_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_push_constants_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_push_constants_op_command (GskVulkanOp      *op,
                                       GskVulkanRender  *render,
@@ -106,7 +100,6 @@ static const GskVulkanOpClass GSK_VULKAN_PUSH_CONSTANTS_OP_CLASS = {
   gsk_vulkan_push_constants_op_count_vertex_data,
   gsk_vulkan_push_constants_op_collect_vertex_data,
   gsk_vulkan_push_constants_op_reserve_descriptor_sets,
-  gsk_vulkan_push_constants_op_get_pipeline,
   gsk_vulkan_push_constants_op_command
 };
 
index 92d3060fedcd018de6a230fa28ff2dcb4d96e0f7..134d38584fc0684a5e6620f4d3bcd1708ebf698e 100644 (file)
@@ -1510,16 +1510,14 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass     *self,
                                                            op->op_class->vertex_input_state,
                                                            gsk_vulkan_image_get_vk_format (self->target),
                                                            self->render_pass);
-        }
-      else
-        op_pipeline = gsk_vulkan_op_get_pipeline (op);
 
-      if (op_pipeline && op_pipeline != current_pipeline)
-        {
-          current_pipeline = op_pipeline;
-          vkCmdBindPipeline (command_buffer,
-                             VK_PIPELINE_BIND_POINT_GRAPHICS,
-                             current_pipeline);
+          if (op_pipeline != current_pipeline)
+            {
+              current_pipeline = op_pipeline;
+              vkCmdBindPipeline (command_buffer,
+                                 VK_PIPELINE_BIND_POINT_GRAPHICS,
+                                 current_pipeline);
+            }
         }
 
       gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
index e684aadd646c638638e3d4ec086de781cd51a6f2..d0e90543181d4094cdc4f560458176fd0699eb4d 100644 (file)
@@ -45,12 +45,6 @@ gsk_vulkan_scissor_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_scissor_op_get_pipeline (GskVulkanOp *op)
-{
-  return NULL;
-}
-
 static void
 gsk_vulkan_scissor_op_command (GskVulkanOp      *op,
                                GskVulkanRender  *render,
@@ -77,7 +71,6 @@ static const GskVulkanOpClass GSK_VULKAN_SCISSOR_OP_CLASS = {
   gsk_vulkan_scissor_op_count_vertex_data,
   gsk_vulkan_scissor_op_collect_vertex_data,
   gsk_vulkan_scissor_op_reserve_descriptor_sets,
-  gsk_vulkan_scissor_op_get_pipeline,
   gsk_vulkan_scissor_op_command
 };
 
index a68ad977d44ebafb2b562368024dd96a2c87a798..2943a116e04a28acaae5086b696a161ecdd5d70f 100644 (file)
@@ -86,12 +86,6 @@ gsk_vulkan_texture_op_reserve_descriptor_sets (GskVulkanOp     *op,
   self->image_descriptor = gsk_vulkan_render_get_image_descriptor (render, self->image, self->sampler);
 }
 
-static VkPipeline
-gsk_vulkan_texture_op_get_pipeline (GskVulkanOp *op)
-{
-  return VK_NULL_HANDLE;
-}
-
 static void
 gsk_vulkan_texture_op_command (GskVulkanOp      *op,
                                GskVulkanRender  *render,
@@ -114,7 +108,6 @@ static const GskVulkanOpClass GSK_VULKAN_TEXTURE_OP_CLASS = {
   gsk_vulkan_texture_op_count_vertex_data,
   gsk_vulkan_texture_op_collect_vertex_data,
   gsk_vulkan_texture_op_reserve_descriptor_sets,
-  gsk_vulkan_texture_op_get_pipeline,
   gsk_vulkan_texture_op_command
 };
 
index dc621982b075bd655fb210c394ea6c7fd19f1cf6..259fc60283648419469964687113d8c0b7b5f8bc 100644 (file)
@@ -79,12 +79,6 @@ gsk_vulkan_upload_cairo_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_upload_cairo_op_get_pipeline (GskVulkanOp *op)
-{
-  return NULL;
-}
-
 static void
 gsk_vulkan_upload_cairo_op_command (GskVulkanOp      *op,
                                     GskVulkanRender  *render,
@@ -102,7 +96,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS = {
   gsk_vulkan_upload_cairo_op_count_vertex_data,
   gsk_vulkan_upload_cairo_op_collect_vertex_data,
   gsk_vulkan_upload_cairo_op_reserve_descriptor_sets,
-  gsk_vulkan_upload_cairo_op_get_pipeline,
   gsk_vulkan_upload_cairo_op_command
 };
 
index a8d7540506b51c79519f31cc27f6b8dbe7d73800..119c6e544d63466d50c6ec56730586df046cd4f5 100644 (file)
@@ -60,12 +60,6 @@ gsk_vulkan_upload_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static VkPipeline
-gsk_vulkan_upload_op_get_pipeline (GskVulkanOp *op)
-{
-  return NULL;
-}
-
 static void
 gsk_vulkan_upload_op_command (GskVulkanOp      *op,
                               GskVulkanRender  *render,
@@ -83,7 +77,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_OP_CLASS = {
   gsk_vulkan_upload_op_count_vertex_data,
   gsk_vulkan_upload_op_collect_vertex_data,
   gsk_vulkan_upload_op_reserve_descriptor_sets,
-  gsk_vulkan_upload_op_get_pipeline,
   gsk_vulkan_upload_op_command
 };