From: Mikko Rasa Date: Thu, 6 Oct 2022 10:31:08 +0000 (+0300) Subject: Rename VulkanFramebuffer::prepare_image_layouts to synchronize_resources X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=627d68b024f0d2fed4a03f0d9d3bb4b78358d6f3 Rename VulkanFramebuffer::prepare_image_layouts to synchronize_resources For consistency with PipelineState. --- diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp index 5de0f090..4791122f 100644 --- a/source/backends/vulkan/commands_backend.cpp +++ b/source/backends/vulkan/commands_backend.cpp @@ -120,7 +120,7 @@ void VulkanCommands::end_render_pass() Synchronizer &sync = device.get_synchronizer(); sync.reset(); if(!fb_is_swapchain) - framebuffer->prepare_image_layouts(discard_fb_contents); + framebuffer->synchronize_resources(discard_fb_contents); sync.barrier(vkCmd); const VkRenderPassBeginInfo &begin_info = *reinterpret_cast(pass_begin_info.data()); diff --git a/source/backends/vulkan/framebuffer_backend.cpp b/source/backends/vulkan/framebuffer_backend.cpp index dcf63e98..93956354 100644 --- a/source/backends/vulkan/framebuffer_backend.cpp +++ b/source/backends/vulkan/framebuffer_backend.cpp @@ -148,7 +148,7 @@ void VulkanFramebuffer::update(unsigned mask) const set_vulkan_object_name(); } -void VulkanFramebuffer::prepare_image_layouts(bool discard) const +void VulkanFramebuffer::synchronize_resources(bool discard) const { for(const Framebuffer::Attachment &a: static_cast(this)->attachments) { diff --git a/source/backends/vulkan/framebuffer_backend.h b/source/backends/vulkan/framebuffer_backend.h index be336a97..24c1d9c6 100644 --- a/source/backends/vulkan/framebuffer_backend.h +++ b/source/backends/vulkan/framebuffer_backend.h @@ -36,7 +36,7 @@ protected: void update(unsigned) const; void require_complete() const { } - void prepare_image_layouts(bool = false) const; + void synchronize_resources(bool = false) const; void set_debug_name(const std::string &); void set_vulkan_object_name() const;