commit 605f863173b69f9cbe40fca2ac1853eb299e8856
author Chris Forbes <chrisforbes@google.com> Fri Aug 23 09:13:19 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Mon Aug 26 19:04:13 2019 +0000
tree a0d7312420006846879100b59ce95804e403f69b
parent 2e5042a390abe9ee3eebb9b52fe0520650443621

Refactor framebuffer clear to be less redundant

Bug: b/119621736
Change-Id: I8a25e6a5dba7e05649c35dc65160f69300bf5791
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35508
Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Vulkan/VkFramebuffer.cpp

diff --git a/src/Vulkan/VkFramebuffer.cpp b/src/Vulkan/VkFramebuffer.cpp
index 8af5cc9..d78b72f 100644
--- a/src/Vulkan/VkFramebuffer.cpp
+++ b/src/Vulkan/VkFramebuffer.cpp
@@ -41,47 +41,29 @@
 	ASSERT(attachmentCount == renderPass->getAttachmentCount());
 
 	const uint32_t count = std::min(clearValueCount, attachmentCount);
-	for(uint32_t i = 0; i < count; i++)
+	for (uint32_t i = 0; i < count; i++)
 	{
-		if (!renderPass->isAttachmentUsed(i))
+		const VkAttachmentDescription attachment = renderPass->getAttachment(i);
+
+		VkImageAspectFlags aspectMask = Format(attachment.format).getAspects();
+		if (attachment.loadOp != VK_ATTACHMENT_LOAD_OP_CLEAR)
+			aspectMask &= VK_IMAGE_ASPECT_STENCIL_BIT;
+		if (attachment.stencilLoadOp != VK_ATTACHMENT_LOAD_OP_CLEAR)
+			aspectMask &= ~VK_IMAGE_ASPECT_STENCIL_BIT;
+
+		if (!aspectMask || !renderPass->isAttachmentUsed(i))
 		{
 			continue;
 		}
 
-		const VkAttachmentDescription attachment = renderPass->getAttachment(i);
-		const Format format(attachment.format);
-		bool isDepth = format.isDepth();
-		bool isStencil = format.isStencil();
-
-		if(isDepth || isStencil)
+		if (renderPass->isMultiView())
 		{
-			bool clearDepth = (isDepth && (attachment.loadOp == VK_ATTACHMENT_LOAD_OP_CLEAR));
-			bool clearStencil = (isStencil && (attachment.stencilLoadOp == VK_ATTACHMENT_LOAD_OP_CLEAR));
-
-			if(clearDepth || clearStencil)
-			{
-				auto aspectMask = (clearDepth ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-								  (clearStencil ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
-				if (renderPass->isMultiView())
-				{
-					attachments[i]->clearWithLayerMask(pClearValues[i], aspectMask, renderArea, renderPass->getAttachmentViewMask(i));
-				}
-				else
-				{
-					attachments[i]->clear(pClearValues[i], aspectMask, renderArea);
-				}
-			}
+			attachments[i]->clearWithLayerMask(pClearValues[i], aspectMask, renderArea,
+											   renderPass->getAttachmentViewMask(i));
 		}
-		else if(attachment.loadOp == VK_ATTACHMENT_LOAD_OP_CLEAR)
+		else
 		{
-			if (renderPass->isMultiView())
-			{
-				attachments[i]->clearWithLayerMask(pClearValues[i], VK_IMAGE_ASPECT_COLOR_BIT, renderArea, renderPass->getAttachmentViewMask(i));
-			}
-			else
-			{
-				attachments[i]->clear(pClearValues[i], VK_IMAGE_ASPECT_COLOR_BIT, renderArea);
-			}
+			attachments[i]->clear(pClearValues[i], aspectMask, renderArea);
 		}
 	}
 }