vulkan: Remove unused arguments from Op vfuncs

Makes code a lot simpler.

diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c
index 7453a0a25ae96d38c9cdc07cad06eae7106b6345..bf3b024f867613c1ea570b6a78adf594f2cbbd9e 100644 (file)
--- a/gsk/vulkan/gskvulkanblendmodeop.c
+++ b/gsk/vulkan/gskvulkanblendmodeop.c
@@ -48,10 +48,8 @@ gsk_vulkan_blend_mode_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_blend_mode_op_upload (GskVulkanOp           *op,
-                                 GskVulkanRenderPass   *pass,
-                                 GskVulkanRender       *render,
-                                 GskVulkanUploader     *uploader)
+gsk_vulkan_blend_mode_op_upload (GskVulkanOp       *op,
+                                 GskVulkanUploader *uploader)
 {
 }
 
@@ -76,10 +74,8 @@ gsk_vulkan_blend_mode_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_blend_mode_op_collect_vertex_data (GskVulkanOp         *op,
-                                              GskVulkanRenderPass *pass,
-                                              GskVulkanRender     *render,
-                                              guchar              *data)
+gsk_vulkan_blend_mode_op_collect_vertex_data (GskVulkanOp *op,
+                                              guchar      *data)
 {
   GskVulkanBlendModeOp *self = (GskVulkanBlendModeOp *) op;
   GskVulkanBlendModeInstance *instance = (GskVulkanBlendModeInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c
index f14c8e152beeeec0261340d250e70153e7b1306f..488a34e893b7ebca2ea637352889b013dc739ab2 100644 (file)
--- a/gsk/vulkan/gskvulkanblurop.c
+++ b/gsk/vulkan/gskvulkanblurop.c
@@ -45,8 +45,6 @@ gsk_vulkan_blur_op_print (GskVulkanOp *op,
 
 static void
 gsk_vulkan_blur_op_upload (GskVulkanOp           *op,
-                           GskVulkanRenderPass   *pass,
-                           GskVulkanRender       *render,
                            GskVulkanUploader     *uploader)
 {
 }
@@ -73,8 +71,6 @@ gsk_vulkan_blur_op_count_vertex_data (GskVulkanOp *op,
 
 static void
 gsk_vulkan_blur_op_collect_vertex_data (GskVulkanOp         *op,
-                                        GskVulkanRenderPass *pass,
-                                        GskVulkanRender     *render,
                                         guchar              *data)
 {
   GskVulkanBlurOp *self = (GskVulkanBlurOp *) op;

diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c
index 967d40e1f072a8b3d5a112e986d2403d1001c787..000580b80b454bec6f8961aab1fcd45ecbd0c192 100644 (file)
--- a/gsk/vulkan/gskvulkanborderop.c
+++ b/gsk/vulkan/gskvulkanborderop.c
@@ -54,10 +54,8 @@ gsk_vulkan_border_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_border_op_upload (GskVulkanOp           *op,
-                             GskVulkanRenderPass   *pass,
-                             GskVulkanRender       *render,
-                             GskVulkanUploader     *uploader)
+gsk_vulkan_border_op_upload (GskVulkanOp       *op,
+                             GskVulkanUploader *uploader)
 {
 }
 
@@ -82,10 +80,8 @@ gsk_vulkan_border_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_border_op_collect_vertex_data (GskVulkanOp         *op,
-                                          GskVulkanRenderPass *pass,
-                                          GskVulkanRender     *render,
-                                          guchar              *data)
+gsk_vulkan_border_op_collect_vertex_data (GskVulkanOp *op,
+                                          guchar      *data)
 {
   GskVulkanBorderOp *self = (GskVulkanBorderOp *) op;
   GskVulkanBorderInstance *instance = (GskVulkanBorderInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c
index 869d04feb0e51d31367b3a29badaac84e242206a..5f302ce908dd9c98f7bb6bfeaf5e4c7523db2106 100644 (file)
--- a/gsk/vulkan/gskvulkancolormatrixop.c
+++ b/gsk/vulkan/gskvulkancolormatrixop.c
@@ -44,10 +44,8 @@ gsk_vulkan_color_matrix_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_color_matrix_op_upload (GskVulkanOp           *op,
-                                   GskVulkanRenderPass   *pass,
-                                   GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader)
+gsk_vulkan_color_matrix_op_upload (GskVulkanOp       *op,
+                                   GskVulkanUploader *uploader)
 {
 }
 
@@ -72,10 +70,8 @@ gsk_vulkan_color_matrix_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_color_matrix_op_collect_vertex_data (GskVulkanOp         *op,
-                                                GskVulkanRenderPass *pass,
-                                                GskVulkanRender     *render,
-                                                guchar              *data)
+gsk_vulkan_color_matrix_op_collect_vertex_data (GskVulkanOp *op,
+                                                guchar      *data)
 {
   GskVulkanColorMatrixOp *self = (GskVulkanColorMatrixOp *) op;
   GskVulkanColorMatrixInstance *instance = (GskVulkanColorMatrixInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkancolorop.c b/gsk/vulkan/gskvulkancolorop.c
index 96e68cdaba78c292b7cadd1a0747bec6ced7c0af..915cf7cc20dea56d4ac1599e064b67b1a39a73c9 100644 (file)
--- a/gsk/vulkan/gskvulkancolorop.c
+++ b/gsk/vulkan/gskvulkancolorop.c
@@ -24,10 +24,8 @@ gsk_vulkan_color_op_finish (GskVulkanOp *op)
 }
 
 static void
-gsk_vulkan_color_op_upload (GskVulkanOp           *op,
-                            GskVulkanRenderPass   *pass,
-                            GskVulkanRender       *render,
-                            GskVulkanUploader     *uploader)
+gsk_vulkan_color_op_upload (GskVulkanOp       *op,
+                            GskVulkanUploader *uploader)
 {
 }
 
@@ -66,10 +64,8 @@ gsk_vulkan_color_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_color_op_collect_vertex_data (GskVulkanOp         *op,
-                                         GskVulkanRenderPass *pass,
-                                         GskVulkanRender     *render,
-                                         guchar              *data)
+gsk_vulkan_color_op_collect_vertex_data (GskVulkanOp *op,
+                                         guchar      *data)
 {
   GskVulkanColorOp *self = (GskVulkanColorOp *) op;
   GskVulkanColorInstance *instance = (GskVulkanColorInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c
index 64b9920decb4c9192441059012462b29c4006fd0..907d48d59e249651e4ae0fd27dc23dc57f5183d0 100644 (file)
--- a/gsk/vulkan/gskvulkancrossfadeop.c
+++ b/gsk/vulkan/gskvulkancrossfadeop.c
@@ -48,10 +48,8 @@ gsk_vulkan_cross_fade_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_cross_fade_op_upload (GskVulkanOp           *op,
-                                 GskVulkanRenderPass   *pass,
-                                 GskVulkanRender       *render,
-                                 GskVulkanUploader     *uploader)
+gsk_vulkan_cross_fade_op_upload (GskVulkanOp       *op,
+                                 GskVulkanUploader *uploader)
 {
 }
 
@@ -76,10 +74,8 @@ gsk_vulkan_cross_fade_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_cross_fade_op_collect_vertex_data (GskVulkanOp         *op,
-                                              GskVulkanRenderPass *pass,
-                                              GskVulkanRender     *render,
-                                              guchar              *data)
+gsk_vulkan_cross_fade_op_collect_vertex_data (GskVulkanOp *op,
+                                              guchar      *data)
 {
   GskVulkanCrossFadeOp *self = (GskVulkanCrossFadeOp *) op;
   GskVulkanCrossFadeInstance *instance = (GskVulkanCrossFadeInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanglyphop.c b/gsk/vulkan/gskvulkanglyphop.c
index 5d903cfdc0dea2084072f059427d6a207467b939..07ebf1202897f378203e372d677fb98ba8f07d60 100644 (file)
--- a/gsk/vulkan/gskvulkanglyphop.c
+++ b/gsk/vulkan/gskvulkanglyphop.c
@@ -31,8 +31,6 @@ gsk_vulkan_glyph_op_finish (GskVulkanOp *op)
 
 static void
 gsk_vulkan_glyph_op_upload (GskVulkanOp         *op,
-                            GskVulkanRenderPass *pass,
-                            GskVulkanRender     *render,
                             GskVulkanUploader   *uploader)
 {
 }
@@ -73,8 +71,6 @@ gsk_vulkan_glyph_op_count_vertex_data (GskVulkanOp *op,
 
 static void
 gsk_vulkan_glyph_op_collect_vertex_data (GskVulkanOp         *op,
-                                         GskVulkanRenderPass *pass,
-                                         GskVulkanRender     *render,
                                          guchar              *data)
 {
   GskVulkanGlyphOp *self = (GskVulkanGlyphOp *) op;

diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c
index 2d76008928c22696ea26ad7a780c815f5b267d1a..85bcfe52bbd19b94337bd48fda3779ed1a82a899 100644 (file)
--- a/gsk/vulkan/gskvulkaninsetshadowop.c
+++ b/gsk/vulkan/gskvulkaninsetshadowop.c
@@ -43,10 +43,8 @@ gsk_vulkan_inset_shadow_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_inset_shadow_op_upload (GskVulkanOp           *op,
-                                   GskVulkanRenderPass   *pass,
-                                   GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader)
+gsk_vulkan_inset_shadow_op_upload (GskVulkanOp       *op,
+                                   GskVulkanUploader *uploader)
 {
 }
 
@@ -71,10 +69,8 @@ gsk_vulkan_inset_shadow_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_inset_shadow_op_collect_vertex_data (GskVulkanOp         *op,
-                                                GskVulkanRenderPass *pass,
-                                                GskVulkanRender     *render,
-                                                guchar              *data)
+gsk_vulkan_inset_shadow_op_collect_vertex_data (GskVulkanOp *op,
+                                                guchar      *data)
 {
   GskVulkanInsetShadowOp *self = (GskVulkanInsetShadowOp *) op;
   GskVulkanInsetShadowInstance *instance = (GskVulkanInsetShadowInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c
index 63020b46a70556b949214b0857f76098f79d20ac..7ad1b6f6fae65fca43e64ddc1fdb95b0553310fc 100644 (file)
--- a/gsk/vulkan/gskvulkanlineargradientop.c
+++ b/gsk/vulkan/gskvulkanlineargradientop.c
@@ -46,8 +46,6 @@ gsk_vulkan_linear_gradient_op_print (GskVulkanOp *op,
 
 static void
 gsk_vulkan_linear_gradient_op_upload (GskVulkanOp           *op,
-                                      GskVulkanRenderPass   *pass,
-                                      GskVulkanRender       *render,
                                       GskVulkanUploader     *uploader)
 {
 }
@@ -74,8 +72,6 @@ gsk_vulkan_linear_gradient_op_count_vertex_data (GskVulkanOp *op,
 
 static void
 gsk_vulkan_linear_gradient_op_collect_vertex_data (GskVulkanOp         *op,
-                                                   GskVulkanRenderPass *pass,
-                                                   GskVulkanRender     *render,
                                                    guchar              *data)
 {
   GskVulkanLinearGradientOp *self = (GskVulkanLinearGradientOp *) op;

diff --git a/gsk/vulkan/gskvulkanmaskop.c b/gsk/vulkan/gskvulkanmaskop.c
index ce9f4669d9f879a2142e86898c8604cd5ae99e61..d53a684e9dd3fd123e6866ea0ad7e154d21aab25 100644 (file)
--- a/gsk/vulkan/gskvulkanmaskop.c
+++ b/gsk/vulkan/gskvulkanmaskop.c
@@ -65,10 +65,8 @@ gsk_vulkan_mask_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_mask_op_upload (GskVulkanOp         *op,
-                           GskVulkanRenderPass *pass,
-                           GskVulkanRender     *render,
-                           GskVulkanUploader   *uploader)
+gsk_vulkan_mask_op_upload (GskVulkanOp       *op,
+                           GskVulkanUploader *uploader)
 {
 }
 
@@ -93,10 +91,8 @@ gsk_vulkan_mask_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_mask_op_collect_vertex_data (GskVulkanOp         *op,
-                                        GskVulkanRenderPass *pass,
-                                        GskVulkanRender     *render,
-                                        guchar              *data)
+gsk_vulkan_mask_op_collect_vertex_data (GskVulkanOp *op,
+                                        guchar      *data)
 {
   GskVulkanMaskOp *self = (GskVulkanMaskOp *) op;
   GskVulkanMaskInstance *instance = (GskVulkanMaskInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanoffscreenop.c b/gsk/vulkan/gskvulkanoffscreenop.c
index b2fc4f4f037d5bd5f8a09f47af6d7d5f9590ebee..7a4a207e085bfa88a07e8ccfa62325f97dfd805a 100644 (file)
--- a/gsk/vulkan/gskvulkanoffscreenop.c
+++ b/gsk/vulkan/gskvulkanoffscreenop.c
@@ -43,14 +43,12 @@ gsk_vulkan_offscreen_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_offscreen_op_upload (GskVulkanOp           *op,
-                                GskVulkanRenderPass   *pass,
-                                GskVulkanRender       *render,
-                                GskVulkanUploader     *uploader)
+gsk_vulkan_offscreen_op_upload (GskVulkanOp       *op,
+                                GskVulkanUploader *uploader)
 {
   GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;
 
-  gsk_vulkan_render_pass_upload (self->render_pass, render, uploader);
+  gsk_vulkan_render_pass_upload (self->render_pass, uploader);
 }
 
 static gsize
@@ -63,14 +61,12 @@ gsk_vulkan_offscreen_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_offscreen_op_collect_vertex_data (GskVulkanOp         *op,
-                                             GskVulkanRenderPass *pass,
-                                             GskVulkanRender     *render,
-                                             guchar              *data)
+gsk_vulkan_offscreen_op_collect_vertex_data (GskVulkanOp *op,
+                                             guchar      *data)
 {
   GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;
 
-  gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, render, data);
+  gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, data);
 }
 
 static void
@@ -137,10 +133,8 @@ gsk_vulkan_offscreen_end_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_offscreen_end_op_upload (GskVulkanOp           *op,
-                                    GskVulkanRenderPass   *pass,
-                                    GskVulkanRender       *render,
-                                    GskVulkanUploader     *uploader)
+gsk_vulkan_offscreen_end_op_upload (GskVulkanOp       *op,
+                                    GskVulkanUploader *uploader)
 {
 }
 
@@ -152,10 +146,8 @@ gsk_vulkan_offscreen_end_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_offscreen_end_op_collect_vertex_data (GskVulkanOp         *op,
-                                                 GskVulkanRenderPass *pass,
-                                                 GskVulkanRender     *render,
-                                                 guchar              *data)
+gsk_vulkan_offscreen_end_op_collect_vertex_data (GskVulkanOp *op,
+                                                 guchar      *data)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c
index d0878f91a4b3e2ab69623715d1a41551342fed50..bbfc46f8b71badc818c08a1d29ff6c56ef4c4906 100644 (file)
--- a/gsk/vulkan/gskvulkanop.c
+++ b/gsk/vulkan/gskvulkanop.c
@@ -31,11 +31,9 @@ gsk_vulkan_op_print (GskVulkanOp *op,
 
 void
 gsk_vulkan_op_upload (GskVulkanOp         *op,
-                      GskVulkanRenderPass *pass,
-                      GskVulkanRender     *render,
                       GskVulkanUploader   *uploader)
 {
-  op->op_class->upload (op, pass, render, uploader);
+  op->op_class->upload (op, uploader);
 }
 
 gsize
@@ -46,12 +44,10 @@ gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
 }
 
 void
-gsk_vulkan_op_collect_vertex_data (GskVulkanOp         *op,
-                                   GskVulkanRenderPass *pass,
-                                   GskVulkanRender     *render,
-                                   guchar              *data)
+gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,
+                                   guchar      *data)
 {
-  op->op_class->collect_vertex_data (op, pass, render, data);
+  op->op_class->collect_vertex_data (op, data);
 }
 
 void

diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h
index b4ff29efafb374b86c8705790ae2e02eee195b7f..1d1040e4cca1304e9020ed57b22401ba9164e7f0 100644 (file)
--- a/gsk/vulkan/gskvulkanopprivate.h
+++ b/gsk/vulkan/gskvulkanopprivate.h
@@ -30,14 +30,10 @@ struct _GskVulkanOpClass
                                                                          guint                   indent);
 
   void                  (* upload)                                      (GskVulkanOp            *op,
-                                                                         GskVulkanRenderPass    *pass,
-                                                                         GskVulkanRender        *render,
                                                                          GskVulkanUploader      *uploader);
   gsize                 (* count_vertex_data)                           (GskVulkanOp            *op,
                                                                          gsize                   n_bytes);
   void                  (* collect_vertex_data)                         (GskVulkanOp            *op,
-                                                                         GskVulkanRenderPass    *pass,
-                                                                         GskVulkanRender        *render,
                                                                          guchar                 *data);
   void                  (* reserve_descriptor_sets)                     (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);
@@ -59,14 +55,10 @@ void                    gsk_vulkan_op_print                             (GskVulk
                                                                          guint                   indent);
 
 void                    gsk_vulkan_op_upload                            (GskVulkanOp            *op,
-                                                                         GskVulkanRenderPass    *pass,
-                                                                         GskVulkanRender        *render,
                                                                          GskVulkanUploader      *uploader);
 gsize                   gsk_vulkan_op_count_vertex_data                 (GskVulkanOp            *op,
                                                                          gsize                   n_bytes);
 void                    gsk_vulkan_op_collect_vertex_data               (GskVulkanOp            *op,
-                                                                         GskVulkanRenderPass    *pass,
-                                                                         GskVulkanRender        *render,
                                                                          guchar                 *data);
 void                    gsk_vulkan_op_reserve_descriptor_sets           (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);

diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c
index 9e59ca20a4a3637d3f61fe57073be84b8377ddf7..0849a537db4c279878f71d3de45490f2ea07f4be 100644 (file)
--- a/gsk/vulkan/gskvulkanoutsetshadowop.c
+++ b/gsk/vulkan/gskvulkanoutsetshadowop.c
@@ -43,10 +43,8 @@ gsk_vulkan_outset_shadow_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_outset_shadow_op_upload (GskVulkanOp           *op,
-                                    GskVulkanRenderPass   *pass,
-                                    GskVulkanRender       *render,
-                                    GskVulkanUploader     *uploader)
+gsk_vulkan_outset_shadow_op_upload (GskVulkanOp       *op,
+                                    GskVulkanUploader *uploader)
 {
 }
 
@@ -71,10 +69,8 @@ gsk_vulkan_outset_shadow_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_outset_shadow_op_collect_vertex_data (GskVulkanOp         *op,
-                                                 GskVulkanRenderPass *pass,
-                                                 GskVulkanRender     *render,
-                                                 guchar              *data)
+gsk_vulkan_outset_shadow_op_collect_vertex_data (GskVulkanOp *op,
+                                                 guchar      *data)
 {
   GskVulkanOutsetShadowOp *self = (GskVulkanOutsetShadowOp *) op;
   GskVulkanOutsetShadowInstance *instance = (GskVulkanOutsetShadowInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanpushconstantsop.c b/gsk/vulkan/gskvulkanpushconstantsop.c
index f16474d391878ec683fca74e5b1309d4dfb5be10..e45c0f93267bf5449bd69e4ae7c95da147beb160 100644 (file)
--- a/gsk/vulkan/gskvulkanpushconstantsop.c
+++ b/gsk/vulkan/gskvulkanpushconstantsop.c
@@ -58,10 +58,8 @@ gsk_vulkan_push_constants_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_push_constants_op_upload (GskVulkanOp           *op,
-                                     GskVulkanRenderPass   *pass,
-                                     GskVulkanRender       *render,
-                                     GskVulkanUploader     *uploader)
+gsk_vulkan_push_constants_op_upload (GskVulkanOp       *op,
+                                     GskVulkanUploader *uploader)
 {
 }
 
@@ -73,10 +71,8 @@ gsk_vulkan_push_constants_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_push_constants_op_collect_vertex_data (GskVulkanOp         *op,
-                                                  GskVulkanRenderPass *pass,
-                                                  GskVulkanRender     *render,
-                                                  guchar              *data)
+gsk_vulkan_push_constants_op_collect_vertex_data (GskVulkanOp *op,
+                                                  guchar      *data)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index e3bdc088ce06403111cbd66499326e614e3d523a..0ba33971e7b09703b54b2ff2c8616c8ea86c2e90 100644 (file)
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -383,7 +383,7 @@ gsk_vulkan_render_upload (GskVulkanRender *self)
   gsk_vulkan_glyph_cache_upload (gsk_vulkan_renderer_get_glyph_cache (GSK_VULKAN_RENDERER (self->renderer)),
                                  self->uploader);
 
-  gsk_vulkan_render_pass_upload (self->render_pass, self, self->uploader);
+  gsk_vulkan_render_pass_upload (self->render_pass, self->uploader);
 
   gsk_vulkan_uploader_upload (self->uploader);
 }
@@ -756,7 +756,7 @@ gsk_vulkan_render_collect_vertex_buffer (GskVulkanRender *self)
     self->vertex_buffer = gsk_vulkan_buffer_new (self->vulkan, round_up (n_bytes, VERTEX_BUFFER_SIZE_STEP));
 
   data = gsk_vulkan_buffer_map (self->vertex_buffer);
-  gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, self, data);
+  gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, data);
   gsk_vulkan_buffer_unmap (self->vertex_buffer);
 }
 

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 3a496a1ad788e642ce92c20d823d8fe87b2f5179..00783b5a21011f782301d4454e10b77ed2f39eea 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -1352,14 +1352,13 @@ gsk_vulkan_render_pass_get_first_op (GskVulkanRenderPass *self)
 
 void
 gsk_vulkan_render_pass_upload (GskVulkanRenderPass  *self,
-                               GskVulkanRender      *render,
                                GskVulkanUploader    *uploader)
 {
   GskVulkanOp *op;
 
   for (op = gsk_vulkan_render_pass_get_first_op (self); op; op = op->next)
     {
-      gsk_vulkan_op_upload (op, self, render, uploader);
+      gsk_vulkan_op_upload (op, uploader);
     }
 }
 
@@ -1379,14 +1378,13 @@ gsk_vulkan_render_pass_count_vertex_data (GskVulkanRenderPass *self,
 
 void
 gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
-                                            GskVulkanRender     *render,
                                             guchar              *data)
 {
   GskVulkanOp *op;
 
   for (op = gsk_vulkan_render_pass_get_first_op (self); op; op = op->next)
     {
-      gsk_vulkan_op_collect_vertex_data (op, self, render, data);
+      gsk_vulkan_op_collect_vertex_data (op, data);
     }
 }
 

diff --git a/gsk/vulkan/gskvulkanrenderpassprivate.h b/gsk/vulkan/gskvulkanrenderpassprivate.h
index 4168ca746f1a5b6bbb9f8958491e6a6a910f304c..db2278b0cb0bbf3205497e98740d980cd3934043 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpassprivate.h
+++ b/gsk/vulkan/gskvulkanrenderpassprivate.h
@@ -29,14 +29,12 @@ gpointer                gsk_vulkan_render_pass_alloc_op                 (GskVulk
                                                                          gsize                   size);
 
 void                    gsk_vulkan_render_pass_upload                   (GskVulkanRenderPass    *self,
-                                                                         GskVulkanRender        *render,
                                                                          GskVulkanUploader      *uploader);
 void                    gsk_vulkan_render_pass_reserve_descriptor_sets  (GskVulkanRenderPass    *self,
                                                                          GskVulkanRender        *render);
 gsize                   gsk_vulkan_render_pass_count_vertex_data        (GskVulkanRenderPass    *self,
                                                                          gsize                   n_bytes);
 void                    gsk_vulkan_render_pass_collect_vertex_data      (GskVulkanRenderPass    *self,
-                                                                         GskVulkanRender        *render,
                                                                          guchar                 *data);
 void                    gsk_vulkan_render_pass_draw                     (GskVulkanRenderPass    *self,
                                                                          GskVulkanRender        *render,

diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c
index 87027799563691822852fc1efb1e5e1d7e81cb04..583c8f49b3e24bb16d0bfca7cde76715a0dce324 100644 (file)
--- a/gsk/vulkan/gskvulkanscissorop.c
+++ b/gsk/vulkan/gskvulkanscissorop.c
@@ -32,10 +32,8 @@ gsk_vulkan_scissor_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_scissor_op_upload (GskVulkanOp           *op,
-                              GskVulkanRenderPass   *pass,
-                              GskVulkanRender       *render,
-                              GskVulkanUploader     *uploader)
+gsk_vulkan_scissor_op_upload (GskVulkanOp       *op,
+                              GskVulkanUploader *uploader)
 {
 }
 
@@ -47,10 +45,8 @@ gsk_vulkan_scissor_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_scissor_op_collect_vertex_data (GskVulkanOp         *op,
-                                           GskVulkanRenderPass *pass,
-                                           GskVulkanRender     *render,
-                                           guchar              *data)
+gsk_vulkan_scissor_op_collect_vertex_data (GskVulkanOp *op,
+                                           guchar      *data)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c
index 1b4afeae5776aa6d61d3832b742aae4cfb680d61..af30e44683a70e85cf231f0704de59a6af6dd7de 100644 (file)
--- a/gsk/vulkan/gskvulkantextureop.c
+++ b/gsk/vulkan/gskvulkantextureop.c
@@ -44,10 +44,8 @@ gsk_vulkan_texture_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_texture_op_upload (GskVulkanOp           *op,
-                              GskVulkanRenderPass   *pass,
-                              GskVulkanRender       *render,
-                              GskVulkanUploader     *uploader)
+gsk_vulkan_texture_op_upload (GskVulkanOp       *op,
+                              GskVulkanUploader *uploader)
 {
 }
 
@@ -72,10 +70,8 @@ gsk_vulkan_texture_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_texture_op_collect_vertex_data (GskVulkanOp         *op,
-                                           GskVulkanRenderPass *pass,
-                                           GskVulkanRender     *render,
-                                           guchar              *data)
+gsk_vulkan_texture_op_collect_vertex_data (GskVulkanOp *op,
+                                           guchar      *data)
 {
   GskVulkanTextureOp *self = (GskVulkanTextureOp *) op;
   GskVulkanTextureInstance *instance = (GskVulkanTextureInstance *) (data + self->vertex_offset);

diff --git a/gsk/vulkan/gskvulkanuploadcairoop.c b/gsk/vulkan/gskvulkanuploadcairoop.c
index 93f2f758c6ecb4dc41a55407c276a7e07a8e8c8b..471fccecc05c41c73e90a84fb27b7b2615b53f29 100644 (file)
--- a/gsk/vulkan/gskvulkanuploadcairoop.c
+++ b/gsk/vulkan/gskvulkanuploadcairoop.c
@@ -38,10 +38,8 @@ gsk_vulkan_upload_cairo_op_print (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_upload_cairo_op_upload (GskVulkanOp           *op,
-                                   GskVulkanRenderPass   *pass,
-                                   GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader)
+gsk_vulkan_upload_cairo_op_upload (GskVulkanOp       *op,
+                                   GskVulkanUploader *uploader)
 {
   GskVulkanUploadCairoOp *self = (GskVulkanUploadCairoOp *) op;
   GskVulkanImageMap map;
@@ -81,10 +79,8 @@ gsk_vulkan_upload_cairo_op_count_vertex_data (GskVulkanOp *op,
 }
 
 static void
-gsk_vulkan_upload_cairo_op_collect_vertex_data (GskVulkanOp         *op,
-                                                GskVulkanRenderPass *pass,
-                                                GskVulkanRender     *render,
-                                                guchar              *data)
+gsk_vulkan_upload_cairo_op_collect_vertex_data (GskVulkanOp *op,
+                                                guchar      *data)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c
index fe6d54f126ac0d2e0eeef242602959b9fff7490c..743aa824a77f1a107b0360aeb171455509d96207 100644 (file)
--- a/gsk/vulkan/gskvulkanuploadop.c
+++ b/gsk/vulkan/gskvulkanuploadop.c
@@ -38,8 +38,6 @@ gsk_vulkan_upload_op_print (GskVulkanOp *op,
 
 static void
 gsk_vulkan_upload_op_upload (GskVulkanOp           *op,
-                             GskVulkanRenderPass   *pass,
-                             GskVulkanRender       *render,
                              GskVulkanUploader     *uploader)
 {
   GskVulkanUploadOp *self = (GskVulkanUploadOp *) op;
@@ -63,8 +61,6 @@ gsk_vulkan_upload_op_count_vertex_data (GskVulkanOp *op,
 
 static void
 gsk_vulkan_upload_op_collect_vertex_data (GskVulkanOp         *op,
-                                          GskVulkanRenderPass *pass,
-                                          GskVulkanRender     *render,
                                           guchar              *data)
 {
 }