Fixes clipping tests supported check
authorMatthew Netsch <quic_mnetsch@quicinc.com>
Wed, 27 May 2020 19:58:36 +0000 (15:58 -0400)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Wed, 27 May 2020 19:58:36 +0000 (15:58 -0400)
Adjacent line modes need to have check
that geometry shaders are supported

Component: Vulkan
VK-GL-CTS Issue: 2383

Affects:
dEQP-VK.clipping.clip_volume.depth_clamp.*

Change-Id: Ifcdc533ab0e9d54e834a7ac8fb609dec7c6ac248

external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp

index 312a2cd..82c9b2a 100644 (file)
@@ -560,21 +560,25 @@ tcu::TestStatus testPrimitivesDepthClamp (Context& context, const VkPrimitiveTop
                        caseMinPixels[1] = caseMinPixels[3] = 2;
                        break;
 
-               case VK_PRIMITIVE_TOPOLOGY_LINE_LIST:
-               case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP:
                case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY:
                case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY:
+                       requireFeatures(context.getInstanceInterface(), context.getPhysicalDevice(), FEATURE_GEOMETRY_SHADER);
+                       // Fallthrough
+               case VK_PRIMITIVE_TOPOLOGY_LINE_LIST:
+               case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP:
                        caseMinPixels[0] = regionPixels;
                        caseMinPixels[1] = RENDER_SIZE - 2;
                        caseMinPixels[2] = regionPixels;
                        caseMinPixels[3] = 2 * (RENDER_SIZE - 2);
                        break;
 
+               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY:
+               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY:
+                       requireFeatures(context.getInstanceInterface(), context.getPhysicalDevice(), FEATURE_GEOMETRY_SHADER);
+                       // Fallthrough
                case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST:
                case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP:
                case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN:
-               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY:
-               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY:
                        caseMinPixels[0] = caseMinPixels[1] = caseMinPixels[2] = caseMinPixels[3] = regionPixels;
                        break;