From 5d30c13f5033fa9ea86ee795ce96d2d2e27027d2 Mon Sep 17 00:00:00 2001 From: Yanjun Zhang Date: Tue, 9 Jan 2018 16:12:47 -0800 Subject: [PATCH] Check GS support before testing adjacent primitives Affects: dEQP-VK.draw.basic_draw.draw.* Components: Vulkan VK-GL-CTS issue: 926 Change-Id: I02569b1944eed52f641966f9206d44983d1ff165 --- external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp b/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp index 65f80a0..e59d45e 100644 --- a/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp @@ -319,6 +319,18 @@ void DrawTestInstanceBase::initialize (const DrawParamsBase& data) const vk::VkDevice device = m_context.getDevice(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); + const vk::VkPhysicalDeviceFeatures features = m_context.getDeviceFeatures(); + + if (features.geometryShader == VK_FALSE && + (m_data.topology == vk::VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY || + m_data.topology == vk::VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY || + m_data.topology == vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY || + m_data.topology == vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY) + ) + { + TCU_THROW(NotSupportedError, "Geometry Not Supported"); + } + const PipelineLayoutCreateInfo pipelineLayoutCreateInfo; m_pipelineLayout = vk::createPipelineLayout(m_vk, device, &pipelineLayoutCreateInfo); -- 2.7.4