vulkan: Remove a function from pipeline impls

That function is available already in the structs we feed to Vulkan.

Store it from there and reuse it.

diff --git a/gsk/vulkan/gskvulkanblendmodepipeline.c b/gsk/vulkan/gskvulkanblendmodepipeline.c
index 1e6943d9dce4033a0b697e0ba0c8836ff5e6b045..bbd649701d679d193314d249f716adc0dc31f53b 100644 (file)
--- a/gsk/vulkan/gskvulkanblendmodepipeline.c
+++ b/gsk/vulkan/gskvulkanblendmodepipeline.c
@@ -98,12 +98,6 @@ gsk_vulkan_blend_mode_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BLEND_MODE_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_blend_mode_pipeline_count_vertex_data (GskVulkanBlendModePipeline *pipeline)
-{
-  return sizeof (GskVulkanBlendModeInstance);
-}
-
 void
 gsk_vulkan_blend_mode_pipeline_collect_vertex_data (GskVulkanBlendModePipeline *pipeline,
                                                     guchar                     *data,

diff --git a/gsk/vulkan/gskvulkanblendmodepipelineprivate.h b/gsk/vulkan/gskvulkanblendmodepipelineprivate.h
index 3a018b7ef3a48407ceefc3b1f4464e5e67847020..00d28994f8bc4c736cbd465f67961369e43dfb4d 100644 (file)
--- a/gsk/vulkan/gskvulkanblendmodepipelineprivate.h
+++ b/gsk/vulkan/gskvulkanblendmodepipelineprivate.h
@@ -18,7 +18,6 @@ GskVulkanPipeline * gsk_vulkan_blend_mode_pipeline_new                 (GdkVulka
                                                                         const char                 *shader_name,
                                                                         VkRenderPass                render_pass);
 
-gsize               gsk_vulkan_blend_mode_pipeline_count_vertex_data   (GskVulkanBlendModePipeline *pipeline);
 void                gsk_vulkan_blend_mode_pipeline_collect_vertex_data (GskVulkanBlendModePipeline *pipeline,
                                                                         guchar                     *data,
                                                                         const graphene_point_t     *offset,

diff --git a/gsk/vulkan/gskvulkanblurpipeline.c b/gsk/vulkan/gskvulkanblurpipeline.c
index 8d596d3227925f274dfdddc2f9e601494579ffde..48705a92ac25dfe0cb37d5887a93d48175154513 100644 (file)
--- a/gsk/vulkan/gskvulkanblurpipeline.c
+++ b/gsk/vulkan/gskvulkanblurpipeline.c
@@ -91,12 +91,6 @@ gsk_vulkan_blur_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BLUR_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_blur_pipeline_count_vertex_data (GskVulkanBlurPipeline *pipeline)
-{
-  return sizeof (GskVulkanBlurInstance);
-}
-
 void
 gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline  *pipeline,
                                               guchar                 *data,

diff --git a/gsk/vulkan/gskvulkanblurpipelineprivate.h b/gsk/vulkan/gskvulkanblurpipelineprivate.h
index b806ed55018926369bceaf39d347ae390c9366c5..278c8a8b5cc03f0266f4fbee16e9e20a44085a1b 100644 (file)
--- a/gsk/vulkan/gskvulkanblurpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanblurpipelineprivate.h
@@ -17,7 +17,6 @@ GskVulkanPipeline *     gsk_vulkan_blur_pipeline_new                   (GdkVulka
                                                                         const char              *shader_name,
                                                                         VkRenderPass             render_pass);
 
-gsize                   gsk_vulkan_blur_pipeline_count_vertex_data     (GskVulkanBlurPipeline   *pipeline);
 void                    gsk_vulkan_blur_pipeline_collect_vertex_data   (GskVulkanBlurPipeline   *pipeline,
                                                                         guchar                  *data,
                                                                         const graphene_point_t  *offset,

diff --git a/gsk/vulkan/gskvulkanborderpipeline.c b/gsk/vulkan/gskvulkanborderpipeline.c
index dfd0442a62f0197570ceb38c2855d5898f207300..927b2aa0c8fc71f612bc11fa1b3580cf870fb0a4 100644 (file)
--- a/gsk/vulkan/gskvulkanborderpipeline.c
+++ b/gsk/vulkan/gskvulkanborderpipeline.c
@@ -123,12 +123,6 @@ gsk_vulkan_border_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BORDER_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_border_pipeline_count_vertex_data (GskVulkanBorderPipeline *pipeline)
-{
-  return sizeof (GskVulkanBorderInstance);
-}
-
 void
 gsk_vulkan_border_pipeline_collect_vertex_data (GskVulkanBorderPipeline *pipeline,
                                                 guchar                  *data,

diff --git a/gsk/vulkan/gskvulkanborderpipelineprivate.h b/gsk/vulkan/gskvulkanborderpipelineprivate.h
index c10976e7047888ff01d55ba5a6b129a146c369e5..2d89dd7ed6d14ed8d25e8a4872dbddbaf8c5aadd 100644 (file)
--- a/gsk/vulkan/gskvulkanborderpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanborderpipelineprivate.h
@@ -18,7 +18,6 @@ GskVulkanPipeline *     gsk_vulkan_border_pipeline_new                  (GdkVulk
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_border_pipeline_count_vertex_data    (GskVulkanBorderPipeline        *pipeline);
 void                    gsk_vulkan_border_pipeline_collect_vertex_data  (GskVulkanBorderPipeline        *pipeline,
                                                                          guchar                         *data,
                                                                          const graphene_point_t         *offset,

diff --git a/gsk/vulkan/gskvulkanboxshadowpipeline.c b/gsk/vulkan/gskvulkanboxshadowpipeline.c
index b4940a97ab998de74525955fbd9574d75e61a891..912174f304bb5501200bd4f2b404926a744e4b9b 100644 (file)
--- a/gsk/vulkan/gskvulkanboxshadowpipeline.c
+++ b/gsk/vulkan/gskvulkanboxshadowpipeline.c
@@ -119,12 +119,6 @@ gsk_vulkan_box_shadow_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BOX_SHADOW_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_box_shadow_pipeline_count_vertex_data (GskVulkanBoxShadowPipeline *pipeline)
-{
-  return sizeof (GskVulkanBoxShadowInstance);
-}
-
 void
 gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline *pipeline,
                                                     guchar                     *data,

diff --git a/gsk/vulkan/gskvulkanboxshadowpipelineprivate.h b/gsk/vulkan/gskvulkanboxshadowpipelineprivate.h
index 7db8d1f9eba05d103228e65683a9179528031733..748341252f5260996acac859a7be2e2a3896f047 100644 (file)
--- a/gsk/vulkan/gskvulkanboxshadowpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanboxshadowpipelineprivate.h
@@ -18,7 +18,6 @@ GskVulkanPipeline *     gsk_vulkan_box_shadow_pipeline_new              (GdkVulk
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_box_shadow_pipeline_count_vertex_data (GskVulkanBoxShadowPipeline    *pipeline);
 void                    gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline  *pipeline,
                                                                          guchar                         *data,
                                                                          const graphene_point_t         *offset,

diff --git a/gsk/vulkan/gskvulkancolorpipeline.c b/gsk/vulkan/gskvulkancolorpipeline.c
index b2e548e11049c84348745977897b118448919d88..abcb0f1721e43b9d2fb5d4cc3d066c2b322e2924 100644 (file)
--- a/gsk/vulkan/gskvulkancolorpipeline.c
+++ b/gsk/vulkan/gskvulkancolorpipeline.c
@@ -84,12 +84,6 @@ gsk_vulkan_color_pipeline_new (GdkVulkanContext         *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_COLOR_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_color_pipeline_count_vertex_data (GskVulkanColorPipeline *pipeline)
-{
-  return sizeof (GskVulkanColorInstance);
-}
-
 void
 gsk_vulkan_color_pipeline_collect_vertex_data (GskVulkanColorPipeline *pipeline,
                                                guchar                 *data,

diff --git a/gsk/vulkan/gskvulkancolorpipelineprivate.h b/gsk/vulkan/gskvulkancolorpipelineprivate.h
index 8c2ec5454dcbe50629283c866c158e122a1152c8..0996bd1271146c30929bdd76828e9e94e755bebc 100644 (file)
--- a/gsk/vulkan/gskvulkancolorpipelineprivate.h
+++ b/gsk/vulkan/gskvulkancolorpipelineprivate.h
@@ -17,7 +17,6 @@ GskVulkanPipeline *     gsk_vulkan_color_pipeline_new                   (GdkVulk
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_color_pipeline_count_vertex_data     (GskVulkanColorPipeline         *pipeline);
 void                    gsk_vulkan_color_pipeline_collect_vertex_data   (GskVulkanColorPipeline         *pipeline,
                                                                          guchar                         *data,
                                                                          const graphene_point_t         *offset,

diff --git a/gsk/vulkan/gskvulkancolortextpipeline.c b/gsk/vulkan/gskvulkancolortextpipeline.c
index 4a4aded9d7b318fd6a73cf76c6766c970181489f..2922c06a7f841316a642fd267ddad214cc5352e0 100644 (file)
--- a/gsk/vulkan/gskvulkancolortextpipeline.c
+++ b/gsk/vulkan/gskvulkancolortextpipeline.c
@@ -84,13 +84,6 @@ gsk_vulkan_color_text_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_COLOR_TEXT_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_color_text_pipeline_count_vertex_data (GskVulkanColorTextPipeline *pipeline,
-                                                  int                         num_instances)
-{
-  return sizeof (GskVulkanColorTextInstance) * num_instances;
-}
-
 void
 gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *pipeline,
                                                     guchar                     *data,

diff --git a/gsk/vulkan/gskvulkancolortextpipelineprivate.h b/gsk/vulkan/gskvulkancolortextpipelineprivate.h
index 382e2d44975ffd21a8b2157353d5c4f5abba624c..c5670ea22c3b570bbde5bea77e9713b806689fd6 100644 (file)
--- a/gsk/vulkan/gskvulkancolortextpipelineprivate.h
+++ b/gsk/vulkan/gskvulkancolortextpipelineprivate.h
@@ -18,8 +18,6 @@ GskVulkanPipeline *     gsk_vulkan_color_text_pipeline_new                   (Gd
                                                                               const char                     *shader_name,
                                                                               VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_color_text_pipeline_count_vertex_data     (GskVulkanColorTextPipeline     *pipeline,
-                                                                              int                             num_instances);
 void                    gsk_vulkan_color_text_pipeline_collect_vertex_data   (GskVulkanColorTextPipeline     *pipeline,
                                                                               guchar                         *data,
                                                                               GskVulkanRenderer              *renderer,

diff --git a/gsk/vulkan/gskvulkancrossfadepipeline.c b/gsk/vulkan/gskvulkancrossfadepipeline.c
index 7452b8681b88474129b52f3ecc7f021b357f69d3..bdcf07acb9842772f1dca30bd4a2181d99cbcd65 100644 (file)
--- a/gsk/vulkan/gskvulkancrossfadepipeline.c
+++ b/gsk/vulkan/gskvulkancrossfadepipeline.c
@@ -98,12 +98,6 @@ gsk_vulkan_cross_fade_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_CROSS_FADE_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_cross_fade_pipeline_count_vertex_data (GskVulkanCrossFadePipeline *pipeline)
-{
-  return sizeof (GskVulkanCrossFadeInstance);
-}
-
 void
 gsk_vulkan_cross_fade_pipeline_collect_vertex_data (GskVulkanCrossFadePipeline *pipeline,
                                                     guchar                     *data,

diff --git a/gsk/vulkan/gskvulkancrossfadepipelineprivate.h b/gsk/vulkan/gskvulkancrossfadepipelineprivate.h
index eee69d6acfc54de2b0b30bb8aa6346d8f80e98be..7b8b6d8f96ef93622ef11bcf94d613fee5506eed 100644 (file)
--- a/gsk/vulkan/gskvulkancrossfadepipelineprivate.h
+++ b/gsk/vulkan/gskvulkancrossfadepipelineprivate.h
@@ -17,7 +17,6 @@ GskVulkanPipeline * gsk_vulkan_cross_fade_pipeline_new                 (GdkVulka
                                                                         const char                 *shader_name,
                                                                         VkRenderPass                render_pass);
 
-gsize               gsk_vulkan_cross_fade_pipeline_count_vertex_data   (GskVulkanCrossFadePipeline *pipeline);
 void                gsk_vulkan_cross_fade_pipeline_collect_vertex_data (GskVulkanCrossFadePipeline *pipeline,
                                                                         guchar                     *data,
                                                                         const graphene_point_t     *offset,

diff --git a/gsk/vulkan/gskvulkaneffectpipeline.c b/gsk/vulkan/gskvulkaneffectpipeline.c
index 559eb038e75064da2cf38d10c90a7837ecd9ad08..3faf769276fc9cc566ba56d52571aefd9090c246 100644 (file)
--- a/gsk/vulkan/gskvulkaneffectpipeline.c
+++ b/gsk/vulkan/gskvulkaneffectpipeline.c
@@ -116,12 +116,6 @@ gsk_vulkan_effect_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_EFFECT_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_effect_pipeline_count_vertex_data (GskVulkanEffectPipeline *pipeline)
-{
-  return sizeof (GskVulkanEffectInstance);
-}
-
 void
 gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipeline,
                                                 guchar                  *data,

diff --git a/gsk/vulkan/gskvulkaneffectpipelineprivate.h b/gsk/vulkan/gskvulkaneffectpipelineprivate.h
index cb4dca445feae48b602eba5184c2210dd11ad7be..ecd1df2667c9e839738b18be26e061b144a1ed4f 100644 (file)
--- a/gsk/vulkan/gskvulkaneffectpipelineprivate.h
+++ b/gsk/vulkan/gskvulkaneffectpipelineprivate.h
@@ -17,7 +17,6 @@ GskVulkanPipeline *     gsk_vulkan_effect_pipeline_new                  (GdkVulk
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_effect_pipeline_count_vertex_data    (GskVulkanEffectPipeline        *pipeline);
 void                    gsk_vulkan_effect_pipeline_collect_vertex_data  (GskVulkanEffectPipeline        *pipeline,
                                                                          guchar                         *data,
                                                                          const graphene_point_t         *offset,

diff --git a/gsk/vulkan/gskvulkanlineargradientpipeline.c b/gsk/vulkan/gskvulkanlineargradientpipeline.c
index bf4b54af7d1eb78e492d82b8c393c046b9572ff5..79de43720c5d7802c54c78b1e850fcbf5dccb0f2 100644 (file)
--- a/gsk/vulkan/gskvulkanlineargradientpipeline.c
+++ b/gsk/vulkan/gskvulkanlineargradientpipeline.c
@@ -167,12 +167,6 @@ gsk_vulkan_linear_gradient_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_LINEAR_GRADIENT_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_linear_gradient_pipeline_count_vertex_data (GskVulkanLinearGradientPipeline *pipeline)
-{
-  return sizeof (GskVulkanLinearGradientInstance);
-}
-
 void
 gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GskVulkanLinearGradientPipeline *pipeline,
                                                          guchar                    *data,

diff --git a/gsk/vulkan/gskvulkanlineargradientpipelineprivate.h b/gsk/vulkan/gskvulkanlineargradientpipelineprivate.h
index fa60c73cd32be6b9e07bd2ac8cbb465ba86ceff6..f33448a91faed5eb4e509547d7b13c3c2e1eab5c 100644 (file)
--- a/gsk/vulkan/gskvulkanlineargradientpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanlineargradientpipelineprivate.h
@@ -20,8 +20,6 @@ GskVulkanPipeline *     gsk_vulkan_linear_gradient_pipeline_new         (GdkVulk
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 
-gsize                   gsk_vulkan_linear_gradient_pipeline_count_vertex_data
-                                                                        (GskVulkanLinearGradientPipeline*pipeline);
 void                    gsk_vulkan_linear_gradient_pipeline_collect_vertex_data
                                                                         (GskVulkanLinearGradientPipeline*pipeline,
                                                                          guchar                         *data,

diff --git a/gsk/vulkan/gskvulkanpipeline.c b/gsk/vulkan/gskvulkanpipeline.c
index a061ee1335a4e5133ec833fc0c5441bef1213a96..62abea88f0fc25ac47561f5988fcd7630a0664f5 100644 (file)
--- a/gsk/vulkan/gskvulkanpipeline.c
+++ b/gsk/vulkan/gskvulkanpipeline.c
@@ -19,6 +19,8 @@ struct _GskVulkanPipelinePrivate
 
   GskVulkanShader *vertex_shader;
   GskVulkanShader *fragment_shader;
+
+  gsize vertex_stride;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GskVulkanPipeline, gsk_vulkan_pipeline, G_TYPE_OBJECT)
@@ -59,6 +61,7 @@ gsk_vulkan_pipeline_new (GType             pipeline_type,
                          const char       *shader_name,
                          VkRenderPass      render_pass)
 {
+  const VkPipelineVertexInputStateCreateInfo *vertex_input_state;
   GskVulkanPipelinePrivate *priv;
   GskVulkanPipeline *self;
   VkDevice device;
@@ -79,6 +82,10 @@ gsk_vulkan_pipeline_new (GType             pipeline_type,
   priv->vertex_shader = gsk_vulkan_shader_new_from_resource (context, GSK_VULKAN_SHADER_VERTEX, shader_name, NULL);
   priv->fragment_shader = gsk_vulkan_shader_new_from_resource (context, GSK_VULKAN_SHADER_FRAGMENT, shader_name, NULL);
 
+  vertex_input_state = GSK_VULKAN_PIPELINE_GET_CLASS (self)->get_input_state_create_info (self);
+  g_assert (vertex_input_state->vertexBindingDescriptionCount == 1);
+  priv->vertex_stride = vertex_input_state->pVertexBindingDescriptions[0].stride;
+
   GSK_VK_CHECK (vkCreateGraphicsPipelines, device,
                                            VK_NULL_HANDLE,
                                            1,
@@ -89,7 +96,7 @@ gsk_vulkan_pipeline_new (GType             pipeline_type,
                                                    GST_VULKAN_SHADER_STAGE_CREATE_INFO (priv->vertex_shader),
                                                    GST_VULKAN_SHADER_STAGE_CREATE_INFO (priv->fragment_shader)
                                                },
-                                               .pVertexInputState = GSK_VULKAN_PIPELINE_GET_CLASS (self)->get_input_state_create_info (self),
+                                               .pVertexInputState = vertex_input_state,
                                                .pInputAssemblyState = &(VkPipelineInputAssemblyStateCreateInfo) {
                                                    .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
                                                    .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,
@@ -164,3 +171,10 @@ gsk_vulkan_pipeline_get_pipeline (GskVulkanPipeline *self)
   return priv->pipeline;
 }
 
+gsize
+gsk_vulkan_pipeline_get_vertex_stride (GskVulkanPipeline *self)
+{
+  GskVulkanPipelinePrivate *priv = gsk_vulkan_pipeline_get_instance_private (self);
+
+  return priv->vertex_stride;
+}

diff --git a/gsk/vulkan/gskvulkanpipelineprivate.h b/gsk/vulkan/gskvulkanpipelineprivate.h
index 50b7158526c11708bd31282184ace047d5afbf0a..067a6546c046e083186ed841ddad748d981f73bb 100644 (file)
--- a/gsk/vulkan/gskvulkanpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanpipelineprivate.h
@@ -37,6 +37,7 @@ GskVulkanPipeline *     gsk_vulkan_pipeline_new                         (GType
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
 VkPipeline              gsk_vulkan_pipeline_get_pipeline                (GskVulkanPipeline              *self);
+gsize                   gsk_vulkan_pipeline_get_vertex_stride           (GskVulkanPipeline              *self);
 
 G_END_DECLS
 

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 4b2fe0699dde23c52329d3274d4d3e97dff06644..6dea4aafbab5242c681779113e85856b13ba7ba6 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -1640,61 +1640,59 @@ gsk_vulkan_render_pass_count_vertex_data (GskVulkanRenderPass *self)
         case GSK_VULKAN_OP_FALLBACK_ROUNDED_CLIP:
         case GSK_VULKAN_OP_TEXTURE:
         case GSK_VULKAN_OP_REPEAT:
-          op->render.vertex_count = gsk_vulkan_texture_pipeline_count_vertex_data (GSK_VULKAN_TEXTURE_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_TEXT:
-          op->text.vertex_count = gsk_vulkan_text_pipeline_count_vertex_data (GSK_VULKAN_TEXT_PIPELINE (op->text.pipeline),
-                                                                              op->text.num_glyphs);
+          op->text.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline) * op->text.num_glyphs;
           n_bytes += op->text.vertex_count;
           break;
 
         case GSK_VULKAN_OP_COLOR_TEXT:
-          op->text.vertex_count = gsk_vulkan_color_text_pipeline_count_vertex_data (GSK_VULKAN_COLOR_TEXT_PIPELINE (op->render.pipeline),
-                                                                                    op->text.num_glyphs);
+          op->text.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline) * op->text.num_glyphs;
           n_bytes += op->text.vertex_count;
           break;
 
         case GSK_VULKAN_OP_COLOR:
-          op->render.vertex_count = gsk_vulkan_color_pipeline_count_vertex_data (GSK_VULKAN_COLOR_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_LINEAR_GRADIENT:
-          op->render.vertex_count = gsk_vulkan_linear_gradient_pipeline_count_vertex_data (GSK_VULKAN_LINEAR_GRADIENT_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_OPACITY:
         case GSK_VULKAN_OP_COLOR_MATRIX:
-          op->render.vertex_count = gsk_vulkan_effect_pipeline_count_vertex_data (GSK_VULKAN_EFFECT_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_BLUR:
-          op->render.vertex_count = gsk_vulkan_blur_pipeline_count_vertex_data (GSK_VULKAN_BLUR_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_BORDER:
-          op->render.vertex_count = gsk_vulkan_border_pipeline_count_vertex_data (GSK_VULKAN_BORDER_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_INSET_SHADOW:
         case GSK_VULKAN_OP_OUTSET_SHADOW:
-          op->render.vertex_count = gsk_vulkan_box_shadow_pipeline_count_vertex_data (GSK_VULKAN_BOX_SHADOW_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_CROSS_FADE:
-          op->render.vertex_count = gsk_vulkan_cross_fade_pipeline_count_vertex_data (GSK_VULKAN_CROSS_FADE_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 
         case GSK_VULKAN_OP_BLEND_MODE:
-          op->render.vertex_count = gsk_vulkan_blend_mode_pipeline_count_vertex_data (GSK_VULKAN_BLEND_MODE_PIPELINE (op->render.pipeline));
+          op->render.vertex_count = gsk_vulkan_pipeline_get_vertex_stride (op->render.pipeline);
           n_bytes += op->render.vertex_count;
           break;
 

diff --git a/gsk/vulkan/gskvulkantextpipeline.c b/gsk/vulkan/gskvulkantextpipeline.c
index e9551f458b9870a444253508df1aec5dc1c77473..0e817da8c0920f386893a97bb89b9b9412a5da04 100644 (file)
--- a/gsk/vulkan/gskvulkantextpipeline.c
+++ b/gsk/vulkan/gskvulkantextpipeline.c
@@ -91,13 +91,6 @@ gsk_vulkan_text_pipeline_new (GdkVulkanContext        *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_TEXT_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_text_pipeline_count_vertex_data (GskVulkanTextPipeline *pipeline,
-                                            int                    num_instances)
-{
-  return sizeof (GskVulkanTextInstance) * num_instances;
-}
-
 void
 gsk_vulkan_text_pipeline_collect_vertex_data (GskVulkanTextPipeline  *pipeline,
                                               guchar                 *data,

diff --git a/gsk/vulkan/gskvulkantextpipelineprivate.h b/gsk/vulkan/gskvulkantextpipelineprivate.h
index eddd572f68395df19a378cb68d2aab32b5f3f68a..c434fa1aef203ff37d166a8c1af929ca8a43a609 100644 (file)
--- a/gsk/vulkan/gskvulkantextpipelineprivate.h
+++ b/gsk/vulkan/gskvulkantextpipelineprivate.h
@@ -18,8 +18,6 @@ GskVulkanPipeline *     gsk_vulkan_text_pipeline_new                   (GdkVulka
                                                                         const char                    *shader_name,
                                                                         VkRenderPass                   render_pass);
 
-gsize                   gsk_vulkan_text_pipeline_count_vertex_data     (GskVulkanTextPipeline         *pipeline,
-                                                                        int                            num_instances);
 void                    gsk_vulkan_text_pipeline_collect_vertex_data   (GskVulkanTextPipeline         *pipeline,
                                                                         guchar                        *data,
                                                                         GskVulkanRenderer             *renderer,

diff --git a/gsk/vulkan/gskvulkantexturepipeline.c b/gsk/vulkan/gskvulkantexturepipeline.c
index bcb238918d051a04eafacbb4993df886a31c06a6..437eeeda39523a358a53b930b5fcdaeb2fc1d056 100644 (file)
--- a/gsk/vulkan/gskvulkantexturepipeline.c
+++ b/gsk/vulkan/gskvulkantexturepipeline.c
@@ -84,12 +84,6 @@ gsk_vulkan_texture_pipeline_new (GdkVulkanContext *context,
   return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_TEXTURE_PIPELINE, context, layout, shader_name, render_pass);
 }
 
-gsize
-gsk_vulkan_texture_pipeline_count_vertex_data (GskVulkanTexturePipeline *pipeline)
-{
-  return sizeof (GskVulkanTextureInstance);
-}
-
 void
 gsk_vulkan_texture_pipeline_collect_vertex_data (GskVulkanTexturePipeline *pipeline,
                                                  guchar                   *data,

diff --git a/gsk/vulkan/gskvulkantexturepipelineprivate.h b/gsk/vulkan/gskvulkantexturepipelineprivate.h
index 71f5382475612664088d4262d8f36a3ca146b92b..a188a56f916768587a0bf4cc7027f4ad08f4d27f 100644 (file)
--- a/gsk/vulkan/gskvulkantexturepipelineprivate.h
+++ b/gsk/vulkan/gskvulkantexturepipelineprivate.h
@@ -17,7 +17,6 @@ GskVulkanPipeline *     gsk_vulkan_texture_pipeline_new                 (GdkVulk
                                                                          const char               *shader_name,
                                                                          VkRenderPass              render_pass);
 
-gsize                   gsk_vulkan_texture_pipeline_count_vertex_data   (GskVulkanTexturePipeline *pipeline);
 void                    gsk_vulkan_texture_pipeline_collect_vertex_data (GskVulkanTexturePipeline *pipeline,
                                                                          guchar                   *data,
                                                                          const graphene_point_t   *offset,