diff options
| author | Alexander Galazin <alexander.galazin@arm.com> | 2020-06-03 12:26:55 +0200 |
|---|---|---|
| committer | Alexander Galazin <alexander.galazin@arm.com> | 2020-06-03 12:26:55 +0200 |
| commit | 68c787b59ac15798b95116178a4f5ee60f6e0904 (patch) | |
| tree | 4f525149ae1da6af031f1b504c6ebf0fced89183 | |
| parent | 663cf7a9fec574036cdb028b8473317f104ae2dd (diff) | |
| parent | 8506f5375cea3e7a88b34880f585b84c04d8f1fa (diff) | |
| download | deqp-68c787b59ac15798b95116178a4f5ee60f6e0904.tar.gz | |
Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4
Change-Id: I5f4f177d073c81c46c3dc2996f5909353e5cd4ff
| -rw-r--r-- | external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp b/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp index 073e189ae..84f133d2c 100644 --- a/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp +++ b/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp @@ -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; |