commit 960577655d59972a34c64d99cc821d77bfbb42f8
author Chris Forbes <chrisforbes@google.com> Fri Apr 12 15:53:06 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Mon Apr 15 19:14:35 2019 +0000
tree 8067aa9a97fcf89bb9ce618c5eacdb9a7da4c8c2
parent f993de30e53967ca65e0ee7d1c232a370515ad91

Support color write mask in pipeline

Bug: b/118386749
Test: dEQP-VK.pipeline.*
Change-Id: Ie549802e6ea9ad89760e2439de5776121fae8c58
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/29028
Tested-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Vulkan/VkPipeline.cpp

diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
index 88fb277..9e83c39 100644
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -332,7 +332,7 @@
 		UNIMPLEMENTED("pCreateInfo->pRasterizationState settings");
 	}
 
-	context.rasterizerDiscard = rasterizationState->rasterizerDiscardEnable;
+	context.rasterizerDiscard = (rasterizationState->rasterizerDiscardEnable == VK_TRUE);
 	context.cullMode = rasterizationState->cullMode;
 	context.frontFacingCCW = rasterizationState->frontFace == VK_FRONT_FACE_COUNTER_CLOCKWISE;
 	context.depthBias = (rasterizationState->depthBiasEnable ? rasterizationState->depthBiasConstantFactor : 0.0f);
@@ -377,12 +377,12 @@
 			UNIMPLEMENTED("depthStencilState");
 		}
 
-		context.depthBoundsTestEnable = depthStencilState->depthBoundsTestEnable;
-		context.depthBufferEnable = depthStencilState->depthTestEnable;
-		context.depthWriteEnable = depthStencilState->depthWriteEnable;
+		context.depthBoundsTestEnable = (depthStencilState->depthBoundsTestEnable == VK_TRUE);
+		context.depthBufferEnable = (depthStencilState->depthTestEnable == VK_TRUE);
+		context.depthWriteEnable = (depthStencilState->depthWriteEnable == VK_TRUE);
 		context.depthCompareMode = depthStencilState->depthCompareOp;
 
-		context.stencilEnable = context.twoSidedStencil = depthStencilState->stencilTestEnable;
+		context.stencilEnable = context.twoSidedStencil = (depthStencilState->stencilTestEnable == VK_TRUE);
 		if(context.stencilEnable)
 		{
 			context.frontStencil = depthStencilState->front;
@@ -411,12 +411,8 @@
 		if(colorBlendState->attachmentCount == 1)
 		{
 			const VkPipelineColorBlendAttachmentState& attachment = colorBlendState->pAttachments[0];
-			if(attachment.colorWriteMask != (VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT))
-			{
-				UNIMPLEMENTED("colorWriteMask");
-			}
-
-			context.alphaBlendEnable = attachment.blendEnable;
+			context.setColorWriteMask(0, attachment.colorWriteMask);
+			context.alphaBlendEnable = (attachment.blendEnable == VK_TRUE);
 			context.separateAlphaBlendEnable = (attachment.alphaBlendOp != attachment.colorBlendOp) ||
 											   (attachment.dstAlphaBlendFactor != attachment.dstColorBlendFactor) ||
 											   (attachment.srcAlphaBlendFactor != attachment.srcColorBlendFactor);