From: Benjamin Otte Date: Thu, 13 Jul 2023 19:12:36 +0000 (+0200) Subject: vulkan: Remove the VulkanOp.upload() vfunc X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~60^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4954e6962f5bebdc388edf0e02042272f6223a4b;p=gtk4.git vulkan: Remove the VulkanOp.upload() vfunc It's not used anymore. --- diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c index 2bebd37f88..c90ca935a8 100644 --- a/gsk/vulkan/gskvulkanblendmodeop.c +++ b/gsk/vulkan/gskvulkanblendmodeop.c @@ -99,7 +99,6 @@ static const GskVulkanShaderOpClass GSK_VULKAN_BLEND_MODE_OP_CLASS = { &gsk_vulkan_blend_mode_info, gsk_vulkan_blend_mode_op_finish, gsk_vulkan_blend_mode_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_blend_mode_op_collect_vertex_data, gsk_vulkan_blend_mode_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c index caa3710a2a..d81a913441 100644 --- a/gsk/vulkan/gskvulkanblurop.c +++ b/gsk/vulkan/gskvulkanblurop.c @@ -73,7 +73,6 @@ static const GskVulkanOpClass GSK_VULKAN_BLUR_OP_CLASS = { &gsk_vulkan_blur_info, gsk_vulkan_blur_op_finish, gsk_vulkan_blur_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_blur_op_collect_vertex_data, gsk_vulkan_blur_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c index c65c2f312c..bb85cfaadc 100644 --- a/gsk/vulkan/gskvulkanborderop.c +++ b/gsk/vulkan/gskvulkanborderop.c @@ -89,7 +89,6 @@ static const GskVulkanOpClass GSK_VULKAN_BORDER_OP_CLASS = { &gsk_vulkan_border_info, gsk_vulkan_border_op_finish, gsk_vulkan_border_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_border_op_collect_vertex_data, gsk_vulkan_border_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanclearop.c b/gsk/vulkan/gskvulkanclearop.c index edb1ad3c68..193d10eee5 100644 --- a/gsk/vulkan/gskvulkanclearop.c +++ b/gsk/vulkan/gskvulkanclearop.c @@ -33,12 +33,6 @@ gsk_vulkan_clear_op_print (GskVulkanOp *op, print_newline (string); } -static void -gsk_vulkan_clear_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_clear_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -103,7 +97,6 @@ static const GskVulkanOpClass GSK_VULKAN_SCISSOR_OP_CLASS = { NULL, gsk_vulkan_clear_op_finish, gsk_vulkan_clear_op_print, - gsk_vulkan_clear_op_upload, gsk_vulkan_clear_op_count_vertex_data, gsk_vulkan_clear_op_collect_vertex_data, gsk_vulkan_clear_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c index 8129af097e..ba126b47e8 100644 --- a/gsk/vulkan/gskvulkancolormatrixop.c +++ b/gsk/vulkan/gskvulkancolormatrixop.c @@ -80,7 +80,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_MATRIX_OP_CLASS = { &gsk_vulkan_color_matrix_info, gsk_vulkan_color_matrix_op_finish, gsk_vulkan_color_matrix_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_color_matrix_op_collect_vertex_data, gsk_vulkan_color_matrix_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkancolorop.c b/gsk/vulkan/gskvulkancolorop.c index 8458c91d55..f07a427a46 100644 --- a/gsk/vulkan/gskvulkancolorop.c +++ b/gsk/vulkan/gskvulkancolorop.c @@ -21,12 +21,6 @@ gsk_vulkan_color_op_finish (GskVulkanOp *op) { } -static void -gsk_vulkan_color_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static void gsk_vulkan_color_op_print (GskVulkanOp *op, GString *string, @@ -71,7 +65,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_OP_CLASS = { &gsk_vulkan_color_info, gsk_vulkan_color_op_finish, gsk_vulkan_color_op_print, - gsk_vulkan_color_op_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_color_op_collect_vertex_data, gsk_vulkan_color_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c index c6216a7e16..04f0561b6b 100644 --- a/gsk/vulkan/gskvulkancrossfadeop.c +++ b/gsk/vulkan/gskvulkancrossfadeop.c @@ -84,7 +84,6 @@ static const GskVulkanOpClass GSK_VULKAN_CROSS_FADE_OP_CLASS = { &gsk_vulkan_cross_fade_info, gsk_vulkan_cross_fade_op_finish, gsk_vulkan_cross_fade_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_cross_fade_op_collect_vertex_data, gsk_vulkan_cross_fade_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanglyphop.c b/gsk/vulkan/gskvulkanglyphop.c index 9c3bea7603..d5eb52ccdc 100644 --- a/gsk/vulkan/gskvulkanglyphop.c +++ b/gsk/vulkan/gskvulkanglyphop.c @@ -71,7 +71,6 @@ static const GskVulkanOpClass GSK_VULKAN_GLYPH_OP_CLASS = { &gsk_vulkan_glyph_info, gsk_vulkan_glyph_op_finish, gsk_vulkan_glyph_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_glyph_op_collect_vertex_data, gsk_vulkan_glyph_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c index 8afa86cdb5..dc984627d1 100644 --- a/gsk/vulkan/gskvulkaninsetshadowop.c +++ b/gsk/vulkan/gskvulkaninsetshadowop.c @@ -67,7 +67,6 @@ static const GskVulkanOpClass GSK_VULKAN_INSET_SHADOW_OP_CLASS = { &gsk_vulkan_inset_shadow_info, gsk_vulkan_inset_shadow_op_finish, gsk_vulkan_inset_shadow_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_inset_shadow_op_collect_vertex_data, gsk_vulkan_inset_shadow_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c index ff90d01f11..44d02842b3 100644 --- a/gsk/vulkan/gskvulkanlineargradientop.c +++ b/gsk/vulkan/gskvulkanlineargradientop.c @@ -79,7 +79,6 @@ static const GskVulkanOpClass GSK_VULKAN_LINEAR_GRADIENT_OP_CLASS = { &gsk_vulkan_linear_info, gsk_vulkan_linear_gradient_op_finish, gsk_vulkan_linear_gradient_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_linear_gradient_op_collect_vertex_data, gsk_vulkan_linear_gradient_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanmaskop.c b/gsk/vulkan/gskvulkanmaskop.c index 61227d6271..700d0ef348 100644 --- a/gsk/vulkan/gskvulkanmaskop.c +++ b/gsk/vulkan/gskvulkanmaskop.c @@ -95,7 +95,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_MASK_OP_CLASS = { &gsk_vulkan_mask_info, gsk_vulkan_mask_op_finish, gsk_vulkan_mask_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_mask_op_collect_vertex_data, gsk_vulkan_mask_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c index 7e9e8ee1ed..0854639fac 100644 --- a/gsk/vulkan/gskvulkanop.c +++ b/gsk/vulkan/gskvulkanop.c @@ -28,13 +28,6 @@ gsk_vulkan_op_print (GskVulkanOp *op, op->op_class->print (op, string, indent); } -void -gsk_vulkan_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ - op->op_class->upload (op, uploader); -} - gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -65,12 +58,6 @@ gsk_vulkan_op_command (GskVulkanOp *op, return op->op_class->command (op, render, pipeline_layout, command_buffer); } -void -gsk_vulkan_op_draw_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static inline gsize round_up (gsize number, gsize divisor) { diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h index dd358cdc59..7f21c5b70d 100644 --- a/gsk/vulkan/gskvulkanopprivate.h +++ b/gsk/vulkan/gskvulkanopprivate.h @@ -38,8 +38,6 @@ struct _GskVulkanOpClass GString *string, guint indent); - void (* upload) (GskVulkanOp *op, - GskVulkanUploader *uploader); gsize (* count_vertex_data) (GskVulkanOp *op, gsize n_bytes); void (* collect_vertex_data) (GskVulkanOp *op, @@ -63,8 +61,6 @@ void gsk_vulkan_op_print (GskVulk GString *string, guint indent); -void gsk_vulkan_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader); gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes); void gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op, @@ -76,8 +72,6 @@ GskVulkanOp * gsk_vulkan_op_command (GskVulk VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer); -void gsk_vulkan_op_draw_upload (GskVulkanOp *op, - GskVulkanUploader *uploader); gsize gsk_vulkan_op_draw_count_vertex_data (GskVulkanOp *op, gsize n_bytes); GskVulkanOp * gsk_vulkan_op_draw_command_n (GskVulkanOp *op, diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c index 1725308397..1e7e2139b3 100644 --- a/gsk/vulkan/gskvulkanoutsetshadowop.c +++ b/gsk/vulkan/gskvulkanoutsetshadowop.c @@ -67,7 +67,6 @@ static const GskVulkanOpClass GSK_VULKAN_OUTSET_SHADOW_OP_CLASS = { &gsk_vulkan_outset_shadow_info, gsk_vulkan_outset_shadow_op_finish, gsk_vulkan_outset_shadow_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_outset_shadow_op_collect_vertex_data, gsk_vulkan_outset_shadow_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanpushconstantsop.c b/gsk/vulkan/gskvulkanpushconstantsop.c index 59aa54f233..7296fe8742 100644 --- a/gsk/vulkan/gskvulkanpushconstantsop.c +++ b/gsk/vulkan/gskvulkanpushconstantsop.c @@ -57,12 +57,6 @@ gsk_vulkan_push_constants_op_print (GskVulkanOp *op, print_newline (string); } -static void -gsk_vulkan_push_constants_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_push_constants_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -107,7 +101,6 @@ static const GskVulkanOpClass GSK_VULKAN_PUSH_CONSTANTS_OP_CLASS = { NULL, gsk_vulkan_push_constants_op_finish, gsk_vulkan_push_constants_op_print, - gsk_vulkan_push_constants_op_upload, gsk_vulkan_push_constants_op_count_vertex_data, gsk_vulkan_push_constants_op_collect_vertex_data, gsk_vulkan_push_constants_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c index 8b412b5470..029abd36c2 100644 --- a/gsk/vulkan/gskvulkanrender.c +++ b/gsk/vulkan/gskvulkanrender.c @@ -506,19 +506,6 @@ gsk_vulkan_render_add_node (GskVulkanRender *self, gsk_vulkan_render_verbose_print (self, "after sort"); } -void -gsk_vulkan_render_upload (GskVulkanRender *self) -{ - GskVulkanOp *op; - - for (op = self->first_op; op; op = op->next) - { - gsk_vulkan_op_upload (op, self->uploader); - } - - gsk_vulkan_uploader_upload (self->uploader); -} - VkPipeline gsk_vulkan_render_get_pipeline (GskVulkanRender *self, const GskVulkanOpClass *op_class, diff --git a/gsk/vulkan/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c index 862e278a5d..2853b8a435 100644 --- a/gsk/vulkan/gskvulkanrenderer.c +++ b/gsk/vulkan/gskvulkanrenderer.c @@ -293,7 +293,6 @@ gsk_vulkan_renderer_render_texture (GskRenderer *renderer, rounded_viewport.size.height); gsk_vulkan_render_reset (render, image, &rounded_viewport, NULL, root); - gsk_vulkan_render_upload (render); gsk_vulkan_render_draw (render); texture = gsk_vulkan_render_download_target (render); @@ -352,7 +351,6 @@ gsk_vulkan_renderer_render (GskRenderer *renderer, draw_index = gdk_vulkan_context_get_draw_index (self->vulkan); gsk_vulkan_render_reset (render, self->targets[draw_index], NULL, render_region, root); - gsk_vulkan_render_upload (render); gsk_vulkan_render_draw (render); #ifdef G_ENABLE_DEBUG diff --git a/gsk/vulkan/gskvulkanrenderpassop.c b/gsk/vulkan/gskvulkanrenderpassop.c index 5ae365da8a..c2f8c8b454 100644 --- a/gsk/vulkan/gskvulkanrenderpassop.c +++ b/gsk/vulkan/gskvulkanrenderpassop.c @@ -45,12 +45,6 @@ gsk_vulkan_render_pass_op_print (GskVulkanOp *op, print_newline (string); } -static void -gsk_vulkan_render_pass_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_render_pass_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -151,7 +145,6 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_OP_CLASS = { NULL, gsk_vulkan_render_pass_op_finish, gsk_vulkan_render_pass_op_print, - gsk_vulkan_render_pass_op_upload, gsk_vulkan_render_pass_op_count_vertex_data, gsk_vulkan_render_pass_op_collect_vertex_data, gsk_vulkan_render_pass_op_reserve_descriptor_sets, @@ -188,12 +181,6 @@ gsk_vulkan_render_pass_end_op_print (GskVulkanOp *op, print_newline (string); } -static void -gsk_vulkan_render_pass_end_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_render_pass_end_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -231,7 +218,6 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_END_OP_CLASS = { NULL, gsk_vulkan_render_pass_end_op_finish, gsk_vulkan_render_pass_end_op_print, - gsk_vulkan_render_pass_end_op_upload, gsk_vulkan_render_pass_end_op_count_vertex_data, gsk_vulkan_render_pass_end_op_collect_vertex_data, gsk_vulkan_render_pass_end_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h index a040a73723..04da854101 100644 --- a/gsk/vulkan/gskvulkanrenderprivate.h +++ b/gsk/vulkan/gskvulkanrenderprivate.h @@ -29,8 +29,6 @@ void gsk_vulkan_render_reset (GskVulk GskRenderer * gsk_vulkan_render_get_renderer (GskVulkanRender *self); GdkVulkanContext * gsk_vulkan_render_get_context (GskVulkanRender *self); -void gsk_vulkan_render_upload (GskVulkanRender *self); - gpointer gsk_vulkan_render_alloc_op (GskVulkanRender *self, gsize size); diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c index b5b40dc1f2..b0bc0be18a 100644 --- a/gsk/vulkan/gskvulkanscissorop.c +++ b/gsk/vulkan/gskvulkanscissorop.c @@ -31,12 +31,6 @@ gsk_vulkan_scissor_op_print (GskVulkanOp *op, print_newline (string); } -static void -gsk_vulkan_scissor_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_scissor_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -82,7 +76,6 @@ static const GskVulkanOpClass GSK_VULKAN_SCISSOR_OP_CLASS = { NULL, gsk_vulkan_scissor_op_finish, gsk_vulkan_scissor_op_print, - gsk_vulkan_scissor_op_upload, gsk_vulkan_scissor_op_count_vertex_data, gsk_vulkan_scissor_op_collect_vertex_data, gsk_vulkan_scissor_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c index 37e3be40cd..9bad4f1992 100644 --- a/gsk/vulkan/gskvulkantextureop.c +++ b/gsk/vulkan/gskvulkantextureop.c @@ -76,7 +76,6 @@ static const GskVulkanOpClass GSK_VULKAN_TEXTURE_OP_CLASS = { &gsk_vulkan_texture_info, gsk_vulkan_texture_op_finish, gsk_vulkan_texture_op_print, - gsk_vulkan_op_draw_upload, gsk_vulkan_op_draw_count_vertex_data, gsk_vulkan_texture_op_collect_vertex_data, gsk_vulkan_texture_op_reserve_descriptor_sets, diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c index ef6b4ef95b..7ddc29918e 100644 --- a/gsk/vulkan/gskvulkanuploadop.c +++ b/gsk/vulkan/gskvulkanuploadop.c @@ -6,12 +6,6 @@ #include "gdk/gdkmemoryformatprivate.h" -static void -gsk_vulkan_upload_op_upload (GskVulkanOp *op, - GskVulkanUploader *uploader) -{ -} - static gsize gsk_vulkan_upload_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes) @@ -264,7 +258,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_TEXTURE_OP_CLASS = { NULL, gsk_vulkan_upload_texture_op_finish, gsk_vulkan_upload_texture_op_print, - gsk_vulkan_upload_op_upload, gsk_vulkan_upload_op_count_vertex_data, gsk_vulkan_upload_op_collect_vertex_data, gsk_vulkan_upload_op_reserve_descriptor_sets, @@ -381,7 +374,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS = { NULL, gsk_vulkan_upload_cairo_op_finish, gsk_vulkan_upload_cairo_op_print, - gsk_vulkan_upload_op_upload, gsk_vulkan_upload_op_count_vertex_data, gsk_vulkan_upload_op_collect_vertex_data, gsk_vulkan_upload_op_reserve_descriptor_sets, @@ -513,7 +505,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_GLYPH_OP_CLASS = { NULL, gsk_vulkan_upload_glyph_op_finish, gsk_vulkan_upload_glyph_op_print, - gsk_vulkan_upload_op_upload, gsk_vulkan_upload_op_count_vertex_data, gsk_vulkan_upload_op_collect_vertex_data, gsk_vulkan_upload_op_reserve_descriptor_sets,