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 5de0f090a9d774aa7e6c8d76d6dc4ebcf7bc5dd8..4791122f3528ff47110618aa19996bee1a8ef9e6 100644 (file)
--- 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)
        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<const VkRenderPassBeginInfo *>(pass_begin_info.data());
        sync.barrier(vkCmd);
 
        const VkRenderPassBeginInfo &begin_info = *reinterpret_cast<const VkRenderPassBeginInfo *>(pass_begin_info.data());

diff --git a/source/backends/vulkan/framebuffer_backend.cpp b/source/backends/vulkan/framebuffer_backend.cpp
index dcf63e9860c1b4c75beb71f3bdfdc53f64420ca2..9395635476025473e182653becb57316737006ed 100644 (file)
--- 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();
 }
 
                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<const Framebuffer *>(this)->attachments)
        {
 {
        for(const Framebuffer::Attachment &a: static_cast<const Framebuffer *>(this)->attachments)
        {

diff --git a/source/backends/vulkan/framebuffer_backend.h b/source/backends/vulkan/framebuffer_backend.h
index be336a97a7e62bc4fd011d98bed9d9aa89109ac7..24c1d9c6d0b238b4866cb5b2617c575372eafdc7 100644 (file)
--- 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 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;
 
        void set_debug_name(const std::string &);
        void set_vulkan_object_name() const;