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 5d9df35..e020cf9 100644 (file)
--- 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 48b84cc..2553a8a 100644 (file)
--- 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 14f206a..61f575e 100644 (file)
--- 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 e1b824a..cd556d3 100644 (file)
--- 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 <Instance>,                                     s_instanceCases),
@@ -3090,10 +3091,10 @@ tcu::TestCaseGroup* createObjectManagementTests (tcu::TestContext& testCtx)
                CASE_DESC(allocCallbackFailTest <DescriptorSetLayout>,          s_descriptorSetLayoutCases),
                CASE_DESC(allocCallbackFailTest <Sampler>,                                      s_samplerCases),
                CASE_DESC(allocCallbackFailTest <DescriptorPool>,                       s_descriptorPoolCases),
-               CASE_DESC(allocCallbackFailTest <DescriptorSet>,                        s_descriptorSetCases),
+               EMPTY_CASE_DESC(DescriptorSet),
                CASE_DESC(allocCallbackFailTest <Framebuffer>,                          s_framebufferCases),
                CASE_DESC(allocCallbackFailTest <CommandPool>,                          s_commandPoolCases),
-               CASE_DESC(allocCallbackFailTest <CommandBuffer>,                        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 9396cb9..474176f 100644 (file)
--- 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 b3624d6..87d7ad4 100644 (file)
--- 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 2f35ecb..dc5c7e7 100644 (file)
--- 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 2f35ecb..dc5c7e7 100644 (file)
--- 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 58b7a57..26ecbbe 100644 (file)
--- 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