Improved the logic in the vulkan graphics system in regards to render…

…pass reuse.
pboechat · Nov 20, 2023 · 5866e0d · 5866e0d
1 parent 076ff73
commit 5866e0d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/FastCG/include/FastCG/Graphics/Vulkan/VulkanGraphicsContext.h b/FastCG/include/FastCG/Graphics/Vulkan/VulkanGraphicsContext.h
@@ -190,6 +190,7 @@ namespace FastCG
         std::vector<PipelineCommand> mPipelineCommands;
         std::vector<CopyCommand> mCopyCommands;
         std::vector<DrawCommand> mDrawCommands;
+        VkRenderPass mPrevRenderPass{VK_NULL_HANDLE};
         std::vector<VulkanClearRequest> mClearRequests;
         bool mEnded{true};
 #if _DEBUG

diff --git a/FastCG/src/Graphics/Vulkan/VulkanGraphicsContext.cpp b/FastCG/src/Graphics/Vulkan/VulkanGraphicsContext.cpp
@@ -559,26 +559,42 @@ namespace FastCG
 				continue;
 			}
 
-			auto it = std::find_if(mClearRequests.begin(), mClearRequests.end(), [pRenderTarget](const auto &rClearRequest)
-								   { return rClearRequest.pTexture == pRenderTarget; });
-			if (it != mClearRequests.end())
-			{
-				mClearRequests.erase(it);
-			}
-
 			renderTargetCount++;
 		}
 
-		if (actualRenderPassDescription.pDepthStencilBuffer != nullptr)
+		if (mPrevRenderPass != VK_NULL_HANDLE && mPrevRenderPass != renderPass)
 		{
-			auto it = std::find_if(mClearRequests.begin(), mClearRequests.end(), [&actualRenderPassDescription](const auto &rClearRequest)
-								   { return rClearRequest.pTexture == actualRenderPassDescription.pDepthStencilBuffer; });
-			if (it != mClearRequests.end())
+			// erase clear requests only if switching renderpasses for reasons other
+			// than indirect attachments clears. this avoids the unnecessary creation/starting
+			// of renderpasses due to those clears.
+			for (const auto *pRenderTarget : actualRenderPassDescription.renderTargets)
 			{
-				mClearRequests.erase(it);
+				if (pRenderTarget == nullptr)
+				{
+					continue;
+				}
+
+				auto it = std::find_if(mClearRequests.begin(), mClearRequests.end(), [pRenderTarget](const auto &rClearRequest)
+									   { return rClearRequest.pTexture == pRenderTarget; });
+				if (it != mClearRequests.end())
+				{
+					mClearRequests.erase(it);
+				}
+			}
+
+			if (actualRenderPassDescription.pDepthStencilBuffer != nullptr)
+			{
+				auto it = std::find_if(mClearRequests.begin(), mClearRequests.end(), [&actualRenderPassDescription](const auto &rClearRequest)
+									   { return rClearRequest.pTexture == actualRenderPassDescription.pDepthStencilBuffer; });
+				if (it != mClearRequests.end())
+				{
+					mClearRequests.erase(it);
+				}
 			}
 		}
 
+		mPrevRenderPass = renderPass;
+
 		auto pipeline = VulkanGraphicsSystem::GetInstance()->GetOrCreatePipeline(mPipelineDescription, renderPass, renderTargetCount, mVertexBuffers).second;
 		assert(pipeline.pipeline != VK_NULL_HANDLE);
 
@@ -1202,6 +1218,7 @@ namespace FastCG
 		mDrawCommands.resize(0);
 		mCopyCommands.resize(0);
 		mClearRequests.resize(0);
+		mPrevRenderPass = VK_NULL_HANDLE;
 #if _DEBUG
 		mMarkerCommands.resize(0);
 #endif