Wire up sample mask correctly

chrisforbes · chrisforbes · commit bbf5cf1e4762 · 2019-03-18T19:28:14.000Z
Bug: b/118386749 Change-Id: I4d6150907a0afea8eeff28334dae1e4af6309075 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26309 Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
@@ -350,10 +350,11 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
 			UNIMPLEMENTED("Unsupported sample count");
 		}
 
+		if (multisampleState->pSampleMask)
+			context.sampleMask = multisampleState->pSampleMask[0];
+
 		if((multisampleState->flags != 0) ||
 			(multisampleState->sampleShadingEnable != 0) ||
-			!((multisampleState->pSampleMask == nullptr) ||
-			(*(multisampleState->pSampleMask) == 0xFFFFFFFFu)) ||
 				(multisampleState->alphaToCoverageEnable != 0) ||
 			(multisampleState->alphaToOneEnable != 0))
 		{

Original file line number	Diff line number	Diff line change
`@@ -350,10 +350,11 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn`
`350`	`350`	`UNIMPLEMENTED("Unsupported sample count");`
`351`	`351`	`}`
`352`	`352`
	`353`	`+ if (multisampleState->pSampleMask)`
	`354`	`+ context.sampleMask = multisampleState->pSampleMask[0];`
	`355`	`+`
`353`	`356`	`if((multisampleState->flags != 0) \|\|`
`354`	`357`	`(multisampleState->sampleShadingEnable != 0) \|\|`
`355`		`- !((multisampleState->pSampleMask == nullptr) \|\|`
`356`		`- (*(multisampleState->pSampleMask) == 0xFFFFFFFFu)) \|\|`
`357`	`358`	`(multisampleState->alphaToCoverageEnable != 0) \|\|`
`358`	`359`	`(multisampleState->alphaToOneEnable != 0))`
`359`	`360`	`{`