From a621bd066bb80f6b4be47033af333e2112eced59 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 3 Jul 2023 16:14:57 +0200 Subject: [PATCH] vulkan: Remove op.get_pipeline() It's unused now that GskVulkanPipeline is gone. --- gsk/vulkan/gskvulkanblendmodeop.c | 7 ------- gsk/vulkan/gskvulkanblurop.c | 7 ------- gsk/vulkan/gskvulkanborderop.c | 7 ------- gsk/vulkan/gskvulkancolormatrixop.c | 7 ------- gsk/vulkan/gskvulkancolorop.c | 7 ------- gsk/vulkan/gskvulkancrossfadeop.c | 7 ------- gsk/vulkan/gskvulkanglyphop.c | 7 ------- gsk/vulkan/gskvulkaninsetshadowop.c | 7 ------- gsk/vulkan/gskvulkanlineargradientop.c | 7 ------- gsk/vulkan/gskvulkanoffscreenop.c | 7 ------- gsk/vulkan/gskvulkanop.c | 6 ------ gsk/vulkan/gskvulkanopprivate.h | 2 -- gsk/vulkan/gskvulkanoutsetshadowop.c | 7 ------- gsk/vulkan/gskvulkanpushconstantsop.c | 7 ------- gsk/vulkan/gskvulkanrenderpass.c | 16 +++++++--------- gsk/vulkan/gskvulkanscissorop.c | 7 ------- gsk/vulkan/gskvulkantextureop.c | 7 ------- gsk/vulkan/gskvulkanuploadcairoop.c | 7 ------- gsk/vulkan/gskvulkanuploadop.c | 7 ------- 19 files changed, 7 insertions(+), 129 deletions(-) diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c index ee50ca26e6..2556818453 100644 --- a/gsk/vulkan/gskvulkanblendmodeop.c +++ b/gsk/vulkan/gskvulkanblendmodeop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c index df2eb427bf..97dd5900ee 100644 --- a/gsk/vulkan/gskvulkanblurop.c +++ b/gsk/vulkan/gskvulkanblurop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c index 0855ea485d..63866265ae 100644 --- a/gsk/vulkan/gskvulkanborderop.c +++ b/gsk/vulkan/gskvulkanborderop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c index f04e96e9e1..bff05a9127 100644 --- a/gsk/vulkan/gskvulkancolormatrixop.c +++ b/gsk/vulkan/gskvulkancolormatrixop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkancolorop.c b/gsk/vulkan/gskvulkancolorop.c index 5dd4ecc608..6aa3ef6f9b 100644 --- a/gsk/vulkan/gskvulkancolorop.c +++ b/gsk/vulkan/gskvulkancolorop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c index 6a229b2281..d3c66a96f0 100644 --- a/gsk/vulkan/gskvulkancrossfadeop.c +++ b/gsk/vulkan/gskvulkancrossfadeop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanglyphop.c b/gsk/vulkan/gskvulkanglyphop.c index 8f9b0c3afb..b18028cd7a 100644 --- a/gsk/vulkan/gskvulkanglyphop.c +++ b/gsk/vulkan/gskvulkanglyphop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c index fa0ceae503..727f9bc3b8 100644 --- a/gsk/vulkan/gskvulkaninsetshadowop.c +++ b/gsk/vulkan/gskvulkaninsetshadowop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c index c680348190..8277ee4693 100644 --- a/gsk/vulkan/gskvulkanlineargradientop.c +++ b/gsk/vulkan/gskvulkanlineargradientop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanoffscreenop.c b/gsk/vulkan/gskvulkanoffscreenop.c index 079f164c05..5e04c72a2c 100644 --- a/gsk/vulkan/gskvulkanoffscreenop.c +++ b/gsk/vulkan/gskvulkanoffscreenop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c index e626ba5149..4723815b4b 100644 --- a/gsk/vulkan/gskvulkanop.c +++ b/gsk/vulkan/gskvulkanop.c @@ -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, diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h index 1d1a7bbdb1..3f49dd49ec 100644 --- a/gsk/vulkan/gskvulkanopprivate.h +++ b/gsk/vulkan/gskvulkanopprivate.h @@ -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, diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c index 0cb29cc2e3..1fbd745591 100644 --- a/gsk/vulkan/gskvulkanoutsetshadowop.c +++ b/gsk/vulkan/gskvulkanoutsetshadowop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanpushconstantsop.c b/gsk/vulkan/gskvulkanpushconstantsop.c index 126d9eb142..ddab7a1266 100644 --- a/gsk/vulkan/gskvulkanpushconstantsop.c +++ b/gsk/vulkan/gskvulkanpushconstantsop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index 92d3060fed..134d38584f 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -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); diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c index e684aadd64..d0e9054318 100644 --- a/gsk/vulkan/gskvulkanscissorop.c +++ b/gsk/vulkan/gskvulkanscissorop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c index a68ad977d4..2943a116e0 100644 --- a/gsk/vulkan/gskvulkantextureop.c +++ b/gsk/vulkan/gskvulkantextureop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanuploadcairoop.c b/gsk/vulkan/gskvulkanuploadcairoop.c index dc621982b0..259fc60283 100644 --- a/gsk/vulkan/gskvulkanuploadcairoop.c +++ b/gsk/vulkan/gskvulkanuploadcairoop.c @@ -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 }; diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c index a8d7540506..119c6e544d 100644 --- a/gsk/vulkan/gskvulkanuploadop.c +++ b/gsk/vulkan/gskvulkanuploadop.c @@ -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 }; -- 2.30.2