upd

nepp95 · Jan 4, 2025 · eca5b32 · eca5b32
1 parent 28831ee
commit eca5b32
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanImage.cpp b/EppoEngine/Source/Platform/Vulkan/VulkanImage.cpp
@@ -217,14 +217,19 @@ namespace Eppo
 		}
 	}
 
-	void VulkanImage::TransitionImage(const VkCommandBuffer commandBuffer, const VkImage image, const VkImageLayout srcLayout, const VkImageLayout dstLayout)
+	void VulkanImage::TransitionImage(const VkCommandBuffer commandBuffer, const VkImage image, const VkImageLayout srcLayout, const VkImageLayout dstLayout, VkPipelineStageFlags2 srcStageMask, VkPipelineStageFlags2 dstStageMask)
 	{
 		EPPO_PROFILE_FUNCTION("VulkanImage::TransitionImage");
 
+		if (!srcStageMask)
+			srcStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT;
+		if (!dstStageMask)
+			dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT;
+
 		VkImageMemoryBarrier2 imageBarrier{};
 		imageBarrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2;
-		imageBarrier.srcStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT;
-		imageBarrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT;
+		imageBarrier.srcStageMask = srcStageMask;
+		imageBarrier.dstStageMask = dstStageMask;
 		imageBarrier.srcAccessMask = VK_ACCESS_2_MEMORY_WRITE_BIT;
 		imageBarrier.dstAccessMask = VK_ACCESS_2_MEMORY_WRITE_BIT | VK_ACCESS_2_MEMORY_READ_BIT;
 		imageBarrier.oldLayout = srcLayout;

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanImage.h b/EppoEngine/Source/Platform/Vulkan/VulkanImage.h
@@ -31,7 +31,7 @@ namespace Eppo
 
 		ImageInfo& GetImageInfo() { return m_ImageInfo; }
 
-		static void TransitionImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout srcLayout, VkImageLayout dstLayout);
+		static void TransitionImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout srcLayout, VkImageLayout dstLayout, VkPipelineStageFlags2 srcStageMask = VK_PIPELINE_STAGE_2_NONE, VkPipelineStageFlags2 dstStageMask = VK_PIPELINE_STAGE_2_NONE);
 		static VkImageAspectFlags GetImageAspectFlags(VkImageLayout layout);
 
 	private:

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanLogicalDevice.cpp b/EppoEngine/Source/Platform/Vulkan/VulkanLogicalDevice.cpp
@@ -168,7 +168,7 @@ namespace Eppo
 		vkFreeCommandBuffers(m_Device, m_CommandPool, 1, &commandBuffer);
 	}
 
-	void VulkanLogicalDevice::FreeCommandBuffer(VkCommandBuffer commandBuffer) const
+	void VulkanLogicalDevice::FreeCommandBuffer(const VkCommandBuffer commandBuffer) const
 	{
 		vkFreeCommandBuffers(m_Device, m_CommandPool, 1, &commandBuffer);
 	}

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.cpp b/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.cpp
@@ -469,7 +469,14 @@ namespace Eppo
 
 			// Transition depth images for writing
 			for (uint32_t i = 0; i < s_MaxLights; i++)
-				VulkanImage::TransitionImage(commandBuffer, std::static_pointer_cast<VulkanImage>(m_ShadowMaps[i])->GetImageInfo().Image, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+				VulkanImage::TransitionImage(
+					commandBuffer, 
+					std::static_pointer_cast<VulkanImage>(m_ShadowMaps[i])->GetImageInfo().Image,
+					VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL,
+					VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+					VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT,
+					VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
+				);
 		});
 	}
 
@@ -668,7 +675,12 @@ namespace Eppo
 
 			// Transition image for reading
 			for (uint32_t i = 0; i < s_MaxLights; i++)
-				VulkanImage::TransitionImage(commandBuffer, std::static_pointer_cast<VulkanImage>(m_ShadowMaps[i])->GetImageInfo().Image, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL);
+				VulkanImage::TransitionImage(
+					commandBuffer,
+					std::static_pointer_cast<VulkanImage>(m_ShadowMaps[i])->GetImageInfo().Image,
+					VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+					VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL
+				);
 
 			if (m_RenderSpecification.DebugRendering)
 				m_DebugRenderer->EndDebugLabel(m_CommandBuffer);

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.h b/EppoEngine/Source/Platform/Vulkan/VulkanSceneRenderer.h
@@ -35,7 +35,7 @@ namespace Eppo
 		void PrepareImages() const;
 		void UpdateDescriptors();
 
-		void GuiPass();
+		static void GuiPass();
 		void PreDepthPass();
 		void EnvPass();
 		void SkyboxPass();

diff --git a/EppoEngine/Source/Platform/Vulkan/VulkanSwapchain.h b/EppoEngine/Source/Platform/Vulkan/VulkanSwapchain.h
@@ -40,7 +40,7 @@ namespace Eppo
 		[[nodiscard]] Ref<VulkanCommandBuffer> GetCommandBuffer() const { return m_CommandBuffer; }
 
 	private:
-		SwapchainSupportDetails QuerySwapchainSupportDetails(const Ref<VulkanPhysicalDevice>& physicalDevice) const;
+		[[nodiscard]] SwapchainSupportDetails QuerySwapchainSupportDetails(const Ref<VulkanPhysicalDevice>& physicalDevice) const;
 
 		static VkSurfaceFormatKHR SelectSurfaceFormat(const std::vector<VkSurfaceFormatKHR>& surfaceFormats);
 		static VkPresentModeKHR SelectPresentMode(const std::vector<VkPresentModeKHR>& presentModes);