From: Benjamin Otte Date: Sat, 8 Jul 2023 18:16:39 +0000 (+0200) Subject: vulkan: Rename function X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~60^2~41 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=05c9f3442c12910b059dacb4868ce64ae70742fd;p=gtk4.git vulkan: Rename function The function name gsk_vulkan_render_get_pipeline() had been used for GskVulkanPipeline. Since those are gone now, we can use that name for VkPipelines. --- diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c index f997ab0443..81be627779 100644 --- a/gsk/vulkan/gskvulkanrender.c +++ b/gsk/vulkan/gskvulkanrender.c @@ -357,11 +357,11 @@ gsk_vulkan_render_upload (GskVulkanRender *self) } VkPipeline -gsk_vulkan_render_create_pipeline (GskVulkanRender *self, - const GskVulkanOpClass *op_class, - const char *clip_type, - VkFormat format, - VkRenderPass render_pass) +gsk_vulkan_render_get_pipeline (GskVulkanRender *self, + const GskVulkanOpClass *op_class, + const char *clip_type, + VkFormat format, + VkRenderPass render_pass) { PipelineCacheKey cache_key; VkPipeline pipeline; diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index 4f2ddf4bb6..1946b19618 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -1449,11 +1449,11 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass *self, (op->op_class != current_pipeline_class || current_pipeline_clip_type != op->clip_type)) { - current_pipeline = gsk_vulkan_render_create_pipeline (render, - op->op_class, - op->clip_type, - gsk_vulkan_image_get_vk_format (self->target), - self->render_pass); + current_pipeline = gsk_vulkan_render_get_pipeline (render, + op->op_class, + op->clip_type, + gsk_vulkan_image_get_vk_format (self->target), + self->render_pass); vkCmdBindPipeline (command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, current_pipeline); diff --git a/gsk/vulkan/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h index 4569c0e6f1..413e9894dd 100644 --- a/gsk/vulkan/gskvulkanrenderprivate.h +++ b/gsk/vulkan/gskvulkanrenderprivate.h @@ -30,7 +30,7 @@ GskRenderer * gsk_vulkan_render_get_renderer (GskVulk void gsk_vulkan_render_upload (GskVulkanRender *self); -VkPipeline gsk_vulkan_render_create_pipeline (GskVulkanRender *self, +VkPipeline gsk_vulkan_render_get_pipeline (GskVulkanRender *self, const GskVulkanOpClass *op_class, const char *clip_type, VkFormat format,