commit 9f2a65eda2ee4d76436d572730b06547892038a4
author Chris Forbes <chrisforbes@google.com> Fri Jun 14 12:38:05 2019 -0700
committer Alexander Galazin <Alexander.Galazin@arm.com> Wed Jun 19 04:05:09 2019 -0400
tree e7efb735baae76fb2f894aee1531c28e6efaa113
parent c7c82722f91037f2eb92d99996fb90692c57e503

Fix sample read tests to use sample rate shading

- The first shader uses gl_SampleID, so needs to run with sample rate
shading.
- Require the sampleRateShading device feature

Affects: dEQP-VK.renderpass*.sampleread.*

Components: Vulkan

VK-GL-CTS Issue: 1832

Change-Id: Ic99ac60581a546deb674db273d6438af8b5b7595

external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
index 3a9eb88..0fb447b 100644
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
@@ -512,8 +512,8 @@
 		(VkPipelineMultisampleStateCreateFlags)0u,
 
 		sampleCountBitFromSampleCount(sampleCount),
-		VK_FALSE,
-		0.0f,
+		VK_TRUE,
+		1.0f,
 		DE_NULL,
 		VK_FALSE,
 		VK_FALSE,
@@ -796,7 +796,8 @@
 
 SampleReadTestInstance::SampleReadTestInstance (Context& context, TestConfig config)
 	: TestInstance					(context)
-	, m_extensionSupported			((config.renderPassType == RENDERPASS_TYPE_RENDERPASS2) && context.requireDeviceExtension("VK_KHR_create_renderpass2"))
+	, m_extensionSupported			(context.requireDeviceCoreFeature(DEVICE_CORE_FEATURE_SAMPLE_RATE_SHADING) &&
+									 ((config.renderPassType != RENDERPASS_TYPE_RENDERPASS2) || context.requireDeviceExtension("VK_KHR_create_renderpass2")))
 	, m_renderPassType				(config.renderPassType)
 	, m_sampleCount					(config.sampleCount)
 	, m_width						(32u)