From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Wed, 5 Apr 2023 15:13:48 +0000 (-0300)
Subject: gsk/vulkan/pipeline: Simplify pipeline creation
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~426^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b6f69946c5d3c2e91fb26efb3cf389a588944fc;p=gtk4.git

gsk/vulkan/pipeline: Simplify pipeline creation

Nothing uses gsk_vulkan_pipeline_new_full() anymore.
---

diff --git a/gsk/vulkan/gskvulkanpipeline.c b/gsk/vulkan/gskvulkanpipeline.c
index 38d5a5795f..7158bf837c 100644
--- a/gsk/vulkan/gskvulkanpipeline.c
+++ b/gsk/vulkan/gskvulkanpipeline.c
@@ -59,20 +59,6 @@ gsk_vulkan_pipeline_new (GType                    pipeline_type,
                          VkPipelineLayout         layout,
                          const char              *shader_name,
                          VkRenderPass             render_pass)
-{
-  return gsk_vulkan_pipeline_new_full (pipeline_type, context, layout, shader_name, render_pass,
-                                       VK_BLEND_FACTOR_ONE,
-                                       VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA);
-}
-
-GskVulkanPipeline *
-gsk_vulkan_pipeline_new_full (GType                    pipeline_type,
-                              GdkVulkanContext        *context,
-                              VkPipelineLayout         layout,
-                              const char              *shader_name,
-                              VkRenderPass             render_pass,
-                              VkBlendFactor            srcBlendFactor,
-                              VkBlendFactor            dstBlendFactor)
 {
   GskVulkanPipelinePrivate *priv;
   GskVulkanPipeline *self;
@@ -140,11 +126,11 @@ gsk_vulkan_pipeline_new_full (GType                    pipeline_type,
                                                        {
                                                            .blendEnable = VK_TRUE,
                                                            .colorBlendOp = VK_BLEND_OP_ADD,
-                                                           .srcColorBlendFactor = srcBlendFactor,
-                                                           .dstColorBlendFactor = dstBlendFactor,
+                                                           .srcColorBlendFactor = VK_BLEND_FACTOR_ONE,
+                                                           .dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA,
                                                            .alphaBlendOp = VK_BLEND_OP_ADD,
-                                                           .srcAlphaBlendFactor = srcBlendFactor,
-                                                           .dstAlphaBlendFactor = dstBlendFactor,
+                                                           .srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE,
+                                                           .dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA,
                                                            .colorWriteMask = VK_COLOR_COMPONENT_A_BIT
                                                                            | VK_COLOR_COMPONENT_R_BIT
                                                                            | VK_COLOR_COMPONENT_G_BIT
diff --git a/gsk/vulkan/gskvulkanpipelineprivate.h b/gsk/vulkan/gskvulkanpipelineprivate.h
index 3deeee978f..39df45b885 100644
--- a/gsk/vulkan/gskvulkanpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanpipelineprivate.h
@@ -36,14 +36,6 @@ GskVulkanPipeline *     gsk_vulkan_pipeline_new                         (GType
                                                                          VkPipelineLayout                layout,
                                                                          const char                     *shader_name,
                                                                          VkRenderPass                    render_pass);
-GskVulkanPipeline *     gsk_vulkan_pipeline_new_full                    (GType                           pipeline_type,
-                                                                         GdkVulkanContext               *context,
-                                                                         VkPipelineLayout                layout,
-                                                                         const char                     *shader_name,
-                                                                         VkRenderPass                    render_pass,
-                                                                         VkBlendFactor                   srcBlendFactor,
-                                                                         VkBlendFactor                   dstBlendFactor);
-
 VkPipeline              gsk_vulkan_pipeline_get_pipeline                (GskVulkanPipeline              *self);
 VkPipelineLayout        gsk_vulkan_pipeline_get_pipeline_layout         (GskVulkanPipeline              *self);