diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2023-04-05 12:13:48 -0300 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2023-04-08 20:13:13 -0300 |
| commit | 8b6f69946c5d3c2e91fb26efb3cf389a588944fc (patch) | |
| tree | 223cc49ae4df65a20d418c97d7674e1d3c0741a9 | |
| parent | 48129298f00bf2f05f4b69627fa6cc8ee65cdb0f (diff) | |
| download | gtk+-8b6f69946c5d3c2e91fb26efb3cf389a588944fc.tar.gz | |
gsk/vulkan/pipeline: Simplify pipeline creation
Nothing uses gsk_vulkan_pipeline_new_full() anymore.
| -rw-r--r-- | gsk/vulkan/gskvulkanpipeline.c | 22 | ||||
| -rw-r--r-- | gsk/vulkan/gskvulkanpipelineprivate.h | 8 |
2 files changed, 4 insertions, 26 deletions
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 @@ -60,20 +60,6 @@ gsk_vulkan_pipeline_new (GType pipeline_type, 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; VkDevice device; @@ -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); |