From e0e648699ac9279650486609cf16ec6e10d73042 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Tue, 23 Jul 2019 23:07:47 -0600 Subject: [PATCH] Test coverage for VK_EXT_index_type_uint8 Adds coverage for VK_EXT_index_type_uint8 by adding a new VK_INDEX_TYPE_UINT8_EXT variant to the existing input_assembly tests. The coverage includes drawing all the primitive topologies with uint8 indices, and also primitive restart. Affects: dEQP-VK.pipeline.input_assembly.* Change-Id: I939c1e0d2c3d4fcfd4386b8b4e419a8ca0e73413 Components: Vulkan --- android/cts/master/vk-master.txt | 45 ++++++++++--- .../pipeline/vktPipelineInputAssemblyTests.cpp | 74 +++++++++++++++++++--- .../mustpass/master/vk-default-no-waivers.txt | 45 ++++++++++--- external/vulkancts/mustpass/master/vk-default.txt | 45 ++++++++++--- external/vulkancts/scripts/gen_framework.py | 1 + 5 files changed, 170 insertions(+), 40 deletions(-) diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 37f9c27..5b7c277 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -210594,16 +210594,36 @@ dEQP-VK.pipeline.vertex_input.max_attributes.128_attributes.binding_one_to_many. dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_one.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.sequential -dEQP-VK.pipeline.input_assembly.primitive_topology.point_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_fan -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.line_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_fan @@ -210614,6 +210634,11 @@ dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_str dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_fan dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.line_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_in_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass_host_query_reset diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp index e4c05f8..9e72805 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp @@ -64,6 +64,7 @@ public: const static VkPrimitiveTopology s_primitiveTopologies[]; const static deUint32 s_restartIndex32; const static deUint16 s_restartIndex16; + const static deUint8 s_restartIndex8; InputAssemblyTest (tcu::TestContext& testContext, const std::string& name, @@ -99,7 +100,8 @@ public: PrimitiveTopologyTest (tcu::TestContext& testContext, const std::string& name, const std::string& description, - VkPrimitiveTopology primitiveTopology); + VkPrimitiveTopology primitiveTopology, + VkIndexType indexType); virtual ~PrimitiveTopologyTest (void) {} protected: @@ -150,6 +152,7 @@ public: private: tcu::TestStatus verifyImage (void); void uploadIndexBufferData16 (deUint16* destPtr, const std::vector& indexBufferData); + void uploadIndexBufferData8 (deUint8* destPtr, const std::vector& indexBufferData); VkPrimitiveTopology m_primitiveTopology; bool m_primitiveRestartEnable; @@ -202,6 +205,7 @@ const VkPrimitiveTopology InputAssemblyTest::s_primitiveTopologies[] = const deUint32 InputAssemblyTest::s_restartIndex32 = ~((deUint32)0u); const deUint16 InputAssemblyTest::s_restartIndex16 = ~((deUint16)0u); +const deUint8 InputAssemblyTest::s_restartIndex8 = ~((deUint8)0u); InputAssemblyTest::InputAssemblyTest (tcu::TestContext& testContext, const std::string& name, @@ -221,6 +225,9 @@ InputAssemblyTest::InputAssemblyTest (tcu::TestContext& testContext, void InputAssemblyTest::checkSupport (Context& context) const { + if (m_indexType == VK_INDEX_TYPE_UINT8_EXT) + context.requireDeviceExtension("VK_EXT_index_type_uint8"); + switch (m_primitiveTopology) { case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY: @@ -280,16 +287,20 @@ void InputAssemblyTest::initPrograms (SourceCollections& sourceCollections) cons bool InputAssemblyTest::isRestartIndex (VkIndexType indexType, deUint32 indexValue) { - if (indexType == VK_INDEX_TYPE_UINT32) - return indexValue == s_restartIndex32; - else + if (indexType == VK_INDEX_TYPE_UINT16) return indexValue == s_restartIndex16; + else if (indexType == VK_INDEX_TYPE_UINT8_EXT) + return indexValue == s_restartIndex8; + else + return indexValue == s_restartIndex32; } deUint32 InputAssemblyTest::getRestartIndex (VkIndexType indexType) { if (indexType == VK_INDEX_TYPE_UINT16) return InputAssemblyTest::s_restartIndex16; + else if (indexType == VK_INDEX_TYPE_UINT8_EXT) + return InputAssemblyTest::s_restartIndex8; else return InputAssemblyTest::s_restartIndex32; } @@ -300,8 +311,9 @@ deUint32 InputAssemblyTest::getRestartIndex (VkIndexType indexType) PrimitiveTopologyTest::PrimitiveTopologyTest (tcu::TestContext& testContext, const std::string& name, const std::string& description, - VkPrimitiveTopology primitiveTopology) - : InputAssemblyTest (testContext, name, description, primitiveTopology, 10, false, VK_INDEX_TYPE_UINT32) + VkPrimitiveTopology primitiveTopology, + VkIndexType indexType) + : InputAssemblyTest (testContext, name, description, primitiveTopology, 10, false, indexType) { } @@ -1270,6 +1282,10 @@ InputAssemblyInstance::InputAssemblyInstance (Context& context, { deMemcpy(m_indexBufferAlloc->getHostPtr(), m_indices.data(), m_indices.size() * sizeof(deUint32)); } + else if (m_indexType == VK_INDEX_TYPE_UINT8_EXT) + { + uploadIndexBufferData8((deUint8*)m_indexBufferAlloc->getHostPtr(), m_indices); + } else // m_indexType == VK_INDEX_TYPE_UINT16 { uploadIndexBufferData16((deUint16*)m_indexBufferAlloc->getHostPtr(), m_indices); @@ -1426,6 +1442,15 @@ void InputAssemblyInstance::uploadIndexBufferData16 (deUint16* destPtr, const st } } +void InputAssemblyInstance::uploadIndexBufferData8 (deUint8* destPtr, const std::vector& indexBufferData) +{ + for (size_t i = 0; i < indexBufferData.size(); i++) + { + DE_ASSERT(indexBufferData[i] <= 0xFF); + destPtr[i] = (deUint8)indexBufferData[i]; + } +} + // Utilities for test names @@ -1442,16 +1467,37 @@ de::MovePtr createPrimitiveTopologyTests (tcu::TestContext& { de::MovePtr primitiveTopologyTests (new tcu::TestCaseGroup(testCtx, "primitive_topology", "")); + de::MovePtr indexUint16Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint16", "")); + de::MovePtr indexUint32Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint32", "")); + de::MovePtr indexUint8Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint8", "")); + for (int topologyNdx = 0; topologyNdx < DE_LENGTH_OF_ARRAY(InputAssemblyTest::s_primitiveTopologies); topologyNdx++) { const VkPrimitiveTopology topology = InputAssemblyTest::s_primitiveTopologies[topologyNdx]; - primitiveTopologyTests->addChild(new PrimitiveTopologyTest(testCtx, - getPrimitiveTopologyCaseName(topology), - "", - topology)); + indexUint16Tests->addChild(new PrimitiveTopologyTest(testCtx, + getPrimitiveTopologyCaseName(topology), + "", + topology, + VK_INDEX_TYPE_UINT16)); + + indexUint32Tests->addChild(new PrimitiveTopologyTest(testCtx, + getPrimitiveTopologyCaseName(topology), + "", + topology, + VK_INDEX_TYPE_UINT32)); + + indexUint8Tests->addChild(new PrimitiveTopologyTest(testCtx, + getPrimitiveTopologyCaseName(topology), + "", + topology, + VK_INDEX_TYPE_UINT8_EXT)); } + primitiveTopologyTests->addChild(indexUint16Tests.release()); + primitiveTopologyTests->addChild(indexUint32Tests.release()); + primitiveTopologyTests->addChild(indexUint8Tests.release()); + return primitiveTopologyTests; } @@ -1470,6 +1516,7 @@ de::MovePtr createPrimitiveRestartTests (tcu::TestContext& t de::MovePtr indexUint16Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint16", "")); de::MovePtr indexUint32Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint32", "")); + de::MovePtr indexUint8Tests (new tcu::TestCaseGroup(testCtx, "index_type_uint8", "")); for (int topologyNdx = 0; topologyNdx < DE_LENGTH_OF_ARRAY(primitiveRestartTopologies); topologyNdx++) { @@ -1486,10 +1533,17 @@ de::MovePtr createPrimitiveRestartTests (tcu::TestContext& t "", topology, VK_INDEX_TYPE_UINT32)); + + indexUint8Tests->addChild(new PrimitiveRestartTest(testCtx, + getPrimitiveTopologyCaseName(topology), + "", + topology, + VK_INDEX_TYPE_UINT8_EXT)); } primitiveRestartTests->addChild(indexUint16Tests.release()); primitiveRestartTests->addChild(indexUint32Tests.release()); + primitiveRestartTests->addChild(indexUint8Tests.release()); return primitiveRestartTests; } diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt index 745d3c3..0f1a020 100644 --- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt @@ -210481,16 +210481,36 @@ dEQP-VK.pipeline.vertex_input.max_attributes.128_attributes.binding_one_to_many. dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_one.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.sequential -dEQP-VK.pipeline.input_assembly.primitive_topology.point_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_fan -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.line_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_fan @@ -210501,6 +210521,11 @@ dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_str dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_fan dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.line_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_in_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass_host_query_reset diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt index 105a8f4..6f9ec0c 100644 --- a/external/vulkancts/mustpass/master/vk-default.txt +++ b/external/vulkancts/mustpass/master/vk-default.txt @@ -210481,16 +210481,36 @@ dEQP-VK.pipeline.vertex_input.max_attributes.128_attributes.binding_one_to_many. dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_one.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.interleaved dEQP-VK.pipeline.vertex_input.max_attributes.query_max_attributes.binding_one_to_many.sequential -dEQP-VK.pipeline.input_assembly.primitive_topology.point_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_fan -dEQP-VK.pipeline.input_assembly.primitive_topology.line_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.line_strip_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_list_with_adjacency -dEQP-VK.pipeline.input_assembly.primitive_topology.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint16.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.point_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_list_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_topology.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.line_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_strip dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint16.triangle_fan @@ -210501,6 +210521,11 @@ dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_str dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_fan dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.line_strip_with_adjacency dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint32.triangle_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_fan +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.line_strip_with_adjacency +dEQP-VK.pipeline.input_assembly.primitive_restart.index_type_uint8.triangle_strip_with_adjacency dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_in_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass dEQP-VK.pipeline.timestamp.basic_graphics_tests.vertex_input_stage_out_of_render_pass_host_query_reset diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py index afeafa1..ab93717 100644 --- a/external/vulkancts/scripts/gen_framework.py +++ b/external/vulkancts/scripts/gen_framework.py @@ -151,6 +151,7 @@ def prefixName (prefix, name): name = name.replace("SMBUILTINS", "SM_BUILTINS") name = name.replace("ASTCHDRFEATURES", "ASTC_HDR_FEATURES") name = name.replace("UINT_8", "UINT8") + name = name.replace("INT_8_", "INT8_") return prefix + name -- 2.7.4