fix image layout transition not changing the layout of the class inst…

…ance
WinteryFox · Jan 30, 2024 · 5efdfa1 · 5efdfa1
1 parent 063d719
commit 5efdfa1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/engine/vk/VkCommandBuffer.cpp b/src/engine/vk/VkCommandBuffer.cpp
@@ -281,7 +281,7 @@ namespace Vixen::Vk {
                                &region);
     }
 
-    void VkCommandBuffer::transitionImage(const VkImage& image, const VkImageLayout layout) const {
+    void VkCommandBuffer::transitionImage(VkImage& image, const VkImageLayout layout) const {
         VkImageMemoryBarrier barrier{
             .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
             .pNext = nullptr,
@@ -355,6 +355,9 @@ namespace Vixen::Vk {
             1,
             &barrier
         );
+
+        // TODO: I hate this, but I'm not sure how else to solve this.
+        image.layout = layout;
     }
 
     void VkCommandBuffer::copyImage(const VkImage& source, const VkImage& destination) const {

diff --git a/src/engine/vk/VkCommandBuffer.h b/src/engine/vk/VkCommandBuffer.h
@@ -73,6 +73,6 @@ namespace Vixen::Vk {
 
         void copyBufferToImage(const VkBuffer& source, const VkImage& destination) const;
 
-        void transitionImage(const VkImage& image, VkImageLayout layout) const;
+        void transitionImage(VkImage& image, VkImageLayout layout) const;
     };
 }
diff --git a/src/engine/vk/VkRenderer.cpp b/src/engine/vk/VkRenderer.cpp
@@ -53,7 +53,7 @@ namespace Vixen::Vk {
                     device->getGraphicsQueue(),
                     {imageAvailableSemaphore.getSemaphore()},
                     {VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT},
-                    {renderFinishedSemaphores[currentFrame].getSemaphore()}
+                    signalSemaphores
                 );
 
                 swapchain->present(imageIndex, signalSemaphores);