From 79a227bc647c1818a5dbfc20a7c6e3dc4e3d63d8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 18 May 2023 21:56:20 +0200 Subject: [PATCH] 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. --- gsk/vulkan/gskvulkanblendmodepipeline.c | 6 ----- .../gskvulkanblendmodepipelineprivate.h | 1 - gsk/vulkan/gskvulkanblurpipeline.c | 6 ----- gsk/vulkan/gskvulkanblurpipelineprivate.h | 1 - gsk/vulkan/gskvulkanborderpipeline.c | 6 ----- gsk/vulkan/gskvulkanborderpipelineprivate.h | 1 - gsk/vulkan/gskvulkanboxshadowpipeline.c | 6 ----- .../gskvulkanboxshadowpipelineprivate.h | 1 - gsk/vulkan/gskvulkancolorpipeline.c | 6 ----- gsk/vulkan/gskvulkancolorpipelineprivate.h | 1 - gsk/vulkan/gskvulkancolortextpipeline.c | 7 ------ .../gskvulkancolortextpipelineprivate.h | 2 -- gsk/vulkan/gskvulkancrossfadepipeline.c | 6 ----- .../gskvulkancrossfadepipelineprivate.h | 1 - gsk/vulkan/gskvulkaneffectpipeline.c | 6 ----- gsk/vulkan/gskvulkaneffectpipelineprivate.h | 1 - gsk/vulkan/gskvulkanlineargradientpipeline.c | 6 ----- .../gskvulkanlineargradientpipelineprivate.h | 2 -- gsk/vulkan/gskvulkanpipeline.c | 16 ++++++++++++- gsk/vulkan/gskvulkanpipelineprivate.h | 1 + gsk/vulkan/gskvulkanrenderpass.c | 24 +++++++++---------- gsk/vulkan/gskvulkantextpipeline.c | 7 ------ gsk/vulkan/gskvulkantextpipelineprivate.h | 2 -- gsk/vulkan/gskvulkantexturepipeline.c | 6 ----- gsk/vulkan/gskvulkantexturepipelineprivate.h | 1 - 25 files changed, 27 insertions(+), 96 deletions(-) diff --git a/gsk/vulkan/gskvulkanblendmodepipeline.c b/gsk/vulkan/gskvulkanblendmodepipeline.c index 1e6943d9dc..bbd649701d 100644 --- 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 3a018b7ef3..00d28994f8 100644 --- 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 8d596d3227..48705a92ac 100644 --- 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 b806ed5501..278c8a8b5c 100644 --- 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 dfd0442a62..927b2aa0c8 100644 --- 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 c10976e704..2d89dd7ed6 100644 --- 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 b4940a97ab..912174f304 100644 --- 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 7db8d1f9eb..748341252f 100644 --- 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 b2e548e110..abcb0f1721 100644 --- 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 8c2ec5454d..0996bd1271 100644 --- 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 4a4aded9d7..2922c06a7f 100644 --- 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 382e2d4497..c5670ea22c 100644 --- 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 7452b8681b..bdcf07acb9 100644 --- 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 eee69d6acf..7b8b6d8f96 100644 --- 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 559eb038e7..3faf769276 100644 --- 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 cb4dca445f..ecd1df2667 100644 --- 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 bf4b54af7d..79de43720c 100644 --- 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 fa60c73cd3..f33448a91f 100644 --- 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 a061ee1335..62abea88f0 100644 --- 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 50b7158526..067a6546c0 100644 --- 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 4b2fe0699d..6dea4aafba 100644 --- 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 e9551f458b..0e817da8c0 100644 --- 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 eddd572f68..c434fa1aef 100644 --- 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 bcb238918d..437eeeda39 100644 --- 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 71f5382475..a188a56f91 100644 --- 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, -- 2.30.2