From efa4cae94922e9de4283405c14ee95712735b52f Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 3 Jul 2023 03:23:17 +0200 Subject: [PATCH] vulkan: Remove hacky function arguments They're unused now that we removed the old render ops. --- gsk/vulkan/gskvulkanblendmodeop.c | 4 +--- gsk/vulkan/gskvulkanblurop.c | 4 +--- gsk/vulkan/gskvulkanborderop.c | 4 +--- gsk/vulkan/gskvulkancolormatrixop.c | 4 +--- gsk/vulkan/gskvulkancolorop.c | 4 +--- gsk/vulkan/gskvulkancrossfadeop.c | 4 +--- gsk/vulkan/gskvulkaninsetshadowop.c | 4 +--- gsk/vulkan/gskvulkanlineargradientop.c | 4 +--- gsk/vulkan/gskvulkanoffscreenop.c | 4 +--- gsk/vulkan/gskvulkanop.c | 12 +++++------- gsk/vulkan/gskvulkanopprivate.h | 8 ++------ gsk/vulkan/gskvulkanoutsetshadowop.c | 4 +--- gsk/vulkan/gskvulkanrenderpass.c | 15 ++------------- gsk/vulkan/gskvulkanscissorop.c | 4 +--- gsk/vulkan/gskvulkantextureop.c | 4 +--- gsk/vulkan/gskvulkanuploadcairoop.c | 4 +--- gsk/vulkan/gskvulkanuploadop.c | 4 +--- 17 files changed, 23 insertions(+), 68 deletions(-) diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c index 150d18b4e3..a8d0930614 100644 --- a/gsk/vulkan/gskvulkanblendmodeop.c +++ b/gsk/vulkan/gskvulkanblendmodeop.c @@ -36,9 +36,7 @@ static void gsk_vulkan_blend_mode_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c index 8d84008c12..84cd66b97d 100644 --- a/gsk/vulkan/gskvulkanblurop.c +++ b/gsk/vulkan/gskvulkanblurop.c @@ -31,9 +31,7 @@ static void gsk_vulkan_blur_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c index 2c1063a21a..9f1f312096 100644 --- a/gsk/vulkan/gskvulkanborderop.c +++ b/gsk/vulkan/gskvulkanborderop.c @@ -28,9 +28,7 @@ static void gsk_vulkan_border_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c index 35d12639da..1e7972272e 100644 --- a/gsk/vulkan/gskvulkancolormatrixop.c +++ b/gsk/vulkan/gskvulkancolormatrixop.c @@ -32,9 +32,7 @@ static void gsk_vulkan_color_matrix_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkancolorop.c b/gsk/vulkan/gskvulkancolorop.c index 77f7d4cda9..5dd4ecc608 100644 --- a/gsk/vulkan/gskvulkancolorop.c +++ b/gsk/vulkan/gskvulkancolorop.c @@ -25,9 +25,7 @@ static void gsk_vulkan_color_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c index 030da86dd8..1967d13254 100644 --- a/gsk/vulkan/gskvulkancrossfadeop.c +++ b/gsk/vulkan/gskvulkancrossfadeop.c @@ -36,9 +36,7 @@ static void gsk_vulkan_cross_fade_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c index 323ee99414..78958852eb 100644 --- a/gsk/vulkan/gskvulkaninsetshadowop.c +++ b/gsk/vulkan/gskvulkaninsetshadowop.c @@ -30,9 +30,7 @@ static void gsk_vulkan_inset_shadow_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c index f3275cb5d2..22aca43614 100644 --- a/gsk/vulkan/gskvulkanlineargradientop.c +++ b/gsk/vulkan/gskvulkanlineargradientop.c @@ -33,9 +33,7 @@ static void gsk_vulkan_linear_gradient_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanoffscreenop.c b/gsk/vulkan/gskvulkanoffscreenop.c index 7745b57387..079f164c05 100644 --- a/gsk/vulkan/gskvulkanoffscreenop.c +++ b/gsk/vulkan/gskvulkanoffscreenop.c @@ -29,9 +29,7 @@ static void gsk_vulkan_offscreen_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op; diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c index a8e304d13f..e626ba5149 100644 --- a/gsk/vulkan/gskvulkanop.c +++ b/gsk/vulkan/gskvulkanop.c @@ -22,14 +22,12 @@ gsk_vulkan_op_finish (GskVulkanOp *op) } void -gsk_vulkan_op_upload (GskVulkanOp *op, - GskVulkanRenderPass *pass, - GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) +gsk_vulkan_op_upload (GskVulkanOp *op, + GskVulkanRenderPass *pass, + GskVulkanRender *render, + GskVulkanUploader *uploader) { - op->op_class->upload (op, pass, render, uploader, clip, scale); + op->op_class->upload (op, pass, render, uploader); } gsize diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h index 2b7c88a16d..8e8bf8e52f 100644 --- a/gsk/vulkan/gskvulkanopprivate.h +++ b/gsk/vulkan/gskvulkanopprivate.h @@ -28,9 +28,7 @@ struct _GskVulkanOpClass void (* upload) (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale); + GskVulkanUploader *uploader); gsize (* count_vertex_data) (GskVulkanOp *op, gsize n_bytes); void (* collect_vertex_data) (GskVulkanOp *op, @@ -56,9 +54,7 @@ void gsk_vulkan_op_finish (GskVulk void gsk_vulkan_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale); + GskVulkanUploader *uploader); gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op, gsize n_bytes); void gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op, diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c index 7610bce039..95ac7e3836 100644 --- a/gsk/vulkan/gskvulkanoutsetshadowop.c +++ b/gsk/vulkan/gskvulkanoutsetshadowop.c @@ -30,9 +30,7 @@ static void gsk_vulkan_outset_shadow_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index 520e42d855..b4989ec6a0 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -1424,21 +1424,12 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self, { GskVulkanOp *op; guint i; - const graphene_rect_t *clip = NULL; - const graphene_vec2_t *scale = NULL; for (i = 0; i < gsk_vulkan_render_ops_get_size (&self->render_ops); i += op->op_class->size) { op = (GskVulkanOp *) gsk_vulkan_render_ops_index (&self->render_ops, i); - gsk_vulkan_op_upload (op, self, render, uploader, clip, scale); - - if (((GskVulkanOpAny *) op)->type == GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS) - { - GskVulkanOpPushConstants *constants = (GskVulkanOpPushConstants *) op; - clip = &constants->clip.bounds; - scale = &constants->scale; - } + gsk_vulkan_op_upload (op, self, render, uploader); } } @@ -1446,9 +1437,7 @@ static void gsk_vulkan_render_op_upload (GskVulkanOp *op_, GskVulkanRenderPass *self, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { GskVulkanOpAll *op = (GskVulkanOpAll *) op_; diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c index 468a154050..e684aadd64 100644 --- a/gsk/vulkan/gskvulkanscissorop.c +++ b/gsk/vulkan/gskvulkanscissorop.c @@ -20,9 +20,7 @@ static void gsk_vulkan_scissor_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c index 45156918d8..972f692502 100644 --- a/gsk/vulkan/gskvulkantextureop.c +++ b/gsk/vulkan/gskvulkantextureop.c @@ -31,9 +31,7 @@ static void gsk_vulkan_texture_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { } diff --git a/gsk/vulkan/gskvulkanuploadcairoop.c b/gsk/vulkan/gskvulkanuploadcairoop.c index 29965660d0..dc621982b0 100644 --- a/gsk/vulkan/gskvulkanuploadcairoop.c +++ b/gsk/vulkan/gskvulkanuploadcairoop.c @@ -26,9 +26,7 @@ static void gsk_vulkan_upload_cairo_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { GskVulkanUploadCairoOp *self = (GskVulkanUploadCairoOp *) op; GskVulkanImageMap map; diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c index ebe997b1ad..a8d7540506 100644 --- a/gsk/vulkan/gskvulkanuploadop.c +++ b/gsk/vulkan/gskvulkanuploadop.c @@ -25,9 +25,7 @@ static void gsk_vulkan_upload_op_upload (GskVulkanOp *op, GskVulkanRenderPass *pass, GskVulkanRender *render, - GskVulkanUploader *uploader, - const graphene_rect_t *clip, - const graphene_vec2_t *scale) + GskVulkanUploader *uploader) { GskVulkanUploadOp *self = (GskVulkanUploadOp *) op; GdkTextureDownloader *downloader; -- 2.30.2