From: Maciej Jesionowski Date: Mon, 9 Jan 2017 11:05:32 +0000 (+0100) Subject: Remove pooled objects from alloc_callback_fail group X-Git-Tag: upstream/0.1.0~9^2~159^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc5d39cbf99e4e9a4ef0c04c7721ef5285ed45bd;p=platform%2Fupstream%2FVK-GL-CTS.git Remove pooled objects from alloc_callback_fail group The pooled objects (VkDescriptorSet and VkCommandBuffer) are properly handled in the alloc_callback_fail_multiple group. The removed cases were redundant, and also didn't work correctly with pooled objects. Removed tests: - dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set - dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary - dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary Change-Id: I212b544096e6e1fd5b98c7985d836e41247107e9 --- diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 5d9df35fa..e020cf9a1 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.object_management.alloc_callback_fail_multiple.graphics_pipeline dEQP-VK.api.object_management.alloc_callback_fail_multiple.compute_pipeline dEQP-VK.api.object_management.alloc_callback_fail_multiple.descriptor_set diff --git a/android/cts/nyc/src/vk-master.txt b/android/cts/nyc/src/vk-master.txt index 48b84cc0e..2553a8a3c 100644 --- a/android/cts/nyc/src/vk-master.txt +++ b/android/cts/nyc/src/vk-master.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/android/cts/nyc/vk-master.txt b/android/cts/nyc/vk-master.txt index 14f206a0c..61f575e87 100644 --- a/android/cts/nyc/vk-master.txt +++ b/android/cts/nyc/vk-master.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp index e1b824aaa..cd556d3c1 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp @@ -3068,6 +3068,7 @@ tcu::TestCaseGroup* createObjectManagementTests (tcu::TestContext& testCtx) }; objectMgmtTests->addChild(createGroup(testCtx, "single_alloc_callbacks", "Create single object", s_createSingleAllocCallbacksGroup)); + // \note Skip pooled objects in this test group. They are properly handled by the "multiple" group farther down below. static const CaseDescriptions s_allocCallbackFailGroup = { CASE_DESC(allocCallbackFailTest , s_instanceCases), @@ -3090,10 +3091,10 @@ tcu::TestCaseGroup* createObjectManagementTests (tcu::TestContext& testCtx) CASE_DESC(allocCallbackFailTest , s_descriptorSetLayoutCases), CASE_DESC(allocCallbackFailTest , s_samplerCases), CASE_DESC(allocCallbackFailTest , s_descriptorPoolCases), - CASE_DESC(allocCallbackFailTest , s_descriptorSetCases), + EMPTY_CASE_DESC(DescriptorSet), CASE_DESC(allocCallbackFailTest , s_framebufferCases), CASE_DESC(allocCallbackFailTest , s_commandPoolCases), - CASE_DESC(allocCallbackFailTest , s_commandBufferCases), + EMPTY_CASE_DESC(CommandBuffer), }; objectMgmtTests->addChild(createGroup(testCtx, "alloc_callback_fail", "Allocation callback failure", s_allocCallbackFailGroup)); diff --git a/external/vulkancts/mustpass/1.0.0/src/master.txt b/external/vulkancts/mustpass/1.0.0/src/master.txt index 9396cb956..474176fa7 100644 --- a/external/vulkancts/mustpass/1.0.0/src/master.txt +++ b/external/vulkancts/mustpass/1.0.0/src/master.txt @@ -1676,12 +1676,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/external/vulkancts/mustpass/1.0.0/vk-default.txt b/external/vulkancts/mustpass/1.0.0/vk-default.txt index b3624d60c..87d7ad463 100644 --- a/external/vulkancts/mustpass/1.0.0/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.0/vk-default.txt @@ -1676,12 +1676,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/external/vulkancts/mustpass/1.0.1/src/master.txt b/external/vulkancts/mustpass/1.0.1/src/master.txt index 2f35ecb1d..dc5c7e71c 100644 --- a/external/vulkancts/mustpass/1.0.1/src/master.txt +++ b/external/vulkancts/mustpass/1.0.1/src/master.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index 2f35ecb1d..dc5c7e71c 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.buffer.create_buffer_1_0 dEQP-VK.api.buffer.create_buffer_2_0 dEQP-VK.api.buffer.create_buffer_3_0 diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt index 58b7a57ec..26ecbbeb5 100644 --- a/external/vulkancts/mustpass/1.0.2/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt @@ -1680,12 +1680,9 @@ dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_empty dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set_layout_single dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool dEQP-VK.api.object_management.alloc_callback_fail.descriptor_pool_free_descriptor_set -dEQP-VK.api.object_management.alloc_callback_fail.descriptor_set dEQP-VK.api.object_management.alloc_callback_fail.framebuffer dEQP-VK.api.object_management.alloc_callback_fail.command_pool dEQP-VK.api.object_management.alloc_callback_fail.command_pool_transient -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_primary -dEQP-VK.api.object_management.alloc_callback_fail.command_buffer_secondary dEQP-VK.api.object_management.alloc_callback_fail_multiple.graphics_pipeline dEQP-VK.api.object_management.alloc_callback_fail_multiple.compute_pipeline dEQP-VK.api.object_management.alloc_callback_fail_multiple.descriptor_set