From 81d0ffffbdf02292b791d21e190b6c9421ed889e Mon Sep 17 00:00:00 2001 From: Yanjun Zhang Date: Tue, 7 Jun 2022 15:23:23 -0700 Subject: RESTRICT AUTOMERGE: Fix draw_indexed_indirect_vk_primitive_topology_* test The draw_indexed_indirect_vk_primitive_topology_* test implementation tcu::TestStatus InstancedDrawInstance::iterate() function needs to check FUNCTION_DRAW_INDEXED_INDIRECT for firstInstanceIndicesCount=1. Affected tests: dEQP-VK.draw.renderpass.instanced.draw_indexed_indirect_vk_primitive_topology_* Components: Vulkan VK-GL-CTS Issue: 3696 Test: dEQP-VK.draw.renderpass.instanced.draw_indexed_indirect_vk_primitive_topology_* Bug: 313944706 Change-Id: I5826e027125fbabe7b6e6dfad6153c6d6bafd1aa Signed-off-by: Benjamin Rood --- external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp index ae714cf9a..1e4eb1e17 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp @@ -544,7 +544,7 @@ tcu::TestStatus InstancedDrawInstance::iterate() int firstInstanceIndicesCount = DE_LENGTH_OF_ARRAY(firstInstanceIndices); // Require 'drawIndirectFirstInstance' feature to run non-zero firstInstance indirect draw tests. - if (m_params.function == TestParams::FUNCTION_DRAW_INDIRECT && !m_context.getDeviceFeatures().drawIndirectFirstInstance) + if ((m_params.function == TestParams::FUNCTION_DRAW_INDIRECT || m_params.function == TestParams::FUNCTION_DRAW_INDEXED_INDIRECT) && !m_context.getDeviceFeatures().drawIndirectFirstInstance) { firstInstanceIndicesCount = 1; } -- cgit v1.2.3