From 9f2a65eda2ee4d76436d572730b06547892038a4 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 14 Jun 2019 12:38:05 -0700 Subject: [PATCH] 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 --- .../modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 @@ Move createRenderPipeline (const DeviceInterface& vkd, (VkPipelineMultisampleStateCreateFlags)0u, sampleCountBitFromSampleCount(sampleCount), - VK_FALSE, - 0.0f, + VK_TRUE, + 1.0f, DE_NULL, VK_FALSE, VK_FALSE, @@ -796,7 +796,8 @@ private: 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) -- 2.7.4