projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2d71b9)
Remove invalid unmatched flags test
authorziga-lunarg <ziga@lunarg.com>
Tue, 27 Sep 2022 18:49:28 +0000 (20:49 +0200)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 6 Oct 2022 15:46:24 +0000 (15:46 +0000)
The test is removed as it tries to perform a test case which is not
allowed by valid usage descriptions

This test was already removed from main, but not older release branches

Components: Vulkan

VK-GL-CTS issue: 3621

Removed tests:
dEQP-VK.api.device_init.create_device_queue2_unmatched_flags

Change-Id: I42c21222f7c3a066ca07b967bdde54dbb3007336

android/cts/master/src/vk-master-2019-03-01.txt patch | blob | history
android/cts/master/vk-master-2019-03-01.txt patch | blob | history
android/cts/master/vk-master.txt patch | blob | history
external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp patch | blob | history
external/vulkancts/mustpass/master/vk-default.txt patch | blob | history

diff --git a/android/cts/master/src/vk-master-2019-03-01.txt b/android/cts/master/src/vk-master-2019-03-01.txt
index dbe7a50..baef37b 100644 (file)
--- a/android/cts/master/src/vk-master-2019-03-01.txt
+++ b/android/cts/master/src/vk-master-2019-03-01.txt
@@ -3713,7 +3713,6 @@ dEQP-VK.api.device_init.create_device_various_queue_counts
 dEQP-VK.api.device_init.create_device_features2
 dEQP-VK.api.device_init.create_device_unsupported_features
 dEQP-VK.api.device_init.create_device_queue2
-dEQP-VK.api.device_init.create_device_queue2_unmatched_flags
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail
 dEQP-VK.api.object_management.single.instance
 dEQP-VK.api.object_management.single.device
diff --git a/android/cts/master/vk-master-2019-03-01.txt b/android/cts/master/vk-master-2019-03-01.txt
index 794814a..0677a3e 100644 (file)
--- a/android/cts/master/vk-master-2019-03-01.txt
+++ b/android/cts/master/vk-master-2019-03-01.txt
@@ -3713,7 +3713,6 @@ dEQP-VK.api.device_init.create_device_various_queue_counts
 dEQP-VK.api.device_init.create_device_features2
 dEQP-VK.api.device_init.create_device_unsupported_features
 dEQP-VK.api.device_init.create_device_queue2
-dEQP-VK.api.device_init.create_device_queue2_unmatched_flags
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail
 dEQP-VK.api.object_management.single.instance
 dEQP-VK.api.object_management.single.device
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index fa20613..555c995 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -3763,7 +3763,6 @@ dEQP-VK.api.device_init.create_device_global_priority
 dEQP-VK.api.device_init.create_device_features2
 dEQP-VK.api.device_init.create_device_unsupported_features
 dEQP-VK.api.device_init.create_device_queue2
-dEQP-VK.api.device_init.create_device_queue2_unmatched_flags
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail
 dEQP-VK.api.object_management.single.instance
 dEQP-VK.api.object_management.single.device
diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 7c2ed18..a3cd9ac 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@ -1255,102 +1255,6 @@ tcu::TestStatus createDeviceQueue2Test (Context& context)
        return tcu::TestStatus::pass("Pass");
 }
 
-tcu::TestStatus createDeviceQueue2UnmatchedFlagsTest (Context& context)
-{
-       if (!context.contextSupports(vk::ApiVersion(1, 1, 0)))
-               TCU_THROW(NotSupportedError, "Vulkan 1.1 is not supported");
-
-       const PlatformInterface&                platformInterface               = context.getPlatformInterface();
-       const VkInstance                                instance                                = context.getInstance();
-       const InstanceInterface&                instanceDriver                  = context.getInstanceInterface();
-       const VkPhysicalDevice                  physicalDevice                  = context.getPhysicalDevice();
-
-       // Check if VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT flag can be used.
-       {
-               VkPhysicalDeviceProtectedMemoryFeatures         protectedFeatures;
-               protectedFeatures.sType         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES;
-               protectedFeatures.pNext         = DE_NULL;
-
-               VkPhysicalDeviceFeatures2                                       deviceFeatures;
-               deviceFeatures.sType            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
-               deviceFeatures.pNext            = &protectedFeatures;
-
-               instanceDriver.getPhysicalDeviceFeatures2(physicalDevice, &deviceFeatures);
-               if (!protectedFeatures.protectedMemory)
-               {
-                       TCU_THROW(NotSupportedError, "protectedMemory feature is not supported, no queue creation flags available");
-               }
-       }
-
-       const deUint32                                                  queueFamilyIndex                = context.getUniversalQueueFamilyIndex();
-       const deUint32                                                  queueCount                              = 1;
-       const deUint32                                                  queueIndex                              = 0;
-       const float                                                             queuePriority                   = 1.0f;
-       const VkDeviceQueueCreateInfo                   deviceQueueCreateInfo   =
-       {
-               VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,     // VkStructureType                                      sType;
-               DE_NULL,                                                                        // const void*                                          pNext;
-               (VkDeviceQueueCreateFlags)0u,                           // VkDeviceQueueCreateFlags                     flags;
-               queueFamilyIndex,                                                       // deUint32                                                     queueFamilyIndex;
-               queueCount,                                                                     // deUint32                                                     queueCount;
-               &queuePriority,                                                         // const float*                                         pQueuePriorities;
-       };
-       VkPhysicalDeviceProtectedMemoryFeatures protectedFeatures               =
-       {
-               VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES,    // VkStructureType                              sType;
-               DE_NULL,                                                                                                                // void*                                                pNext;
-               VK_TRUE                                                                                                                 // VkBool32                                             protectedMemory;
-       };
-
-       VkPhysicalDeviceFeatures                                emptyDeviceFeatures;
-       deMemset(&emptyDeviceFeatures, 0, sizeof(emptyDeviceFeatures));
-
-       const VkPhysicalDeviceFeatures2                 deviceFeatures                  =
-       {
-               VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2,                                   // VkStructureType                              sType;
-               &protectedFeatures,                                                                                             // void*                                                pNext;
-               emptyDeviceFeatures                                                                                             // VkPhysicalDeviceFeatures             features;
-       };
-
-       const VkDeviceCreateInfo                                deviceCreateInfo                =
-       {
-               VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,           // VkStructureType                                      sType;
-               &deviceFeatures,                                                        // const void*                                          pNext;
-               (VkDeviceCreateFlags)0u,                                        // VkDeviceCreateFlags                          flags;
-               1,                                                                                      // deUint32                                                     queueCreateInfoCount;
-               &deviceQueueCreateInfo,                                         // const VkDeviceQueueCreateInfo*       pQueueCreateInfos;
-               0,                                                                                      // deUint32                                                     enabledLayerCount;
-               DE_NULL,                                                                        // const char* const*                           ppEnabledLayerNames;
-               0,                                                                                      // deUint32                                                     enabledExtensionCount;
-               DE_NULL,                                                                        // const char* const*                           ppEnabledExtensionNames;
-               DE_NULL,                                                                        // const VkPhysicalDeviceFeatures*      pEnabledFeatures;
-       };
-
-       const VkDeviceQueueInfo2                                deviceQueueInfo2                =
-       {
-               VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2,          // VkStructureType                                      sType;
-               DE_NULL,                                                                        // const void*                                          pNext;
-               VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT,           // VkDeviceQueueCreateFlags                     flags;
-               queueFamilyIndex,                                                       // deUint32                                                     queueFamilyIndex;
-               queueIndex,                                                                     // deUint32                                                     queueIndex;
-       };
-
-       {
-               const Unique<VkDevice>          device                                  (createCustomDevice(context.getTestContext().getCommandLine().isValidationEnabled(), platformInterface, instance, instanceDriver, physicalDevice, &deviceCreateInfo));
-               const DeviceDriver                      deviceDriver                    (platformInterface, instance, device.get());
-               const VkQueue                           queue2                                  = getDeviceQueue2(deviceDriver, *device, &deviceQueueInfo2);
-
-               if (queue2 != DE_NULL)
-                       return tcu::TestStatus::fail("Fail, getDeviceQueue2 should return VK_NULL_HANDLE when flags in VkDeviceQueueCreateInfo and VkDeviceQueueInfo2 are different.");
-
-               const VkQueue                           queue                                   = getDeviceQueue(deviceDriver, *device,  queueFamilyIndex, queueIndex);
-
-               VK_CHECK(deviceDriver.queueWaitIdle(queue));
-       }
-
-       return tcu::TestStatus::pass("Pass");
-}
-
 // Allocation tracking utilities
 struct AllocTrack
 {
@@ -1730,7 +1634,6 @@ tcu::TestCaseGroup* createDeviceInitializationTests (tcu::TestContext& testCtx)
        addFunctionCase(deviceInitializationTests.get(), "create_device_features2",                                                     "", createDeviceFeatures2Test);
        addFunctionCase(deviceInitializationTests.get(), "create_device_unsupported_features",                          "", createDeviceWithUnsupportedFeaturesTest);
        addFunctionCase(deviceInitializationTests.get(), "create_device_queue2",                                                        "", createDeviceQueue2Test);
-       addFunctionCase(deviceInitializationTests.get(), "create_device_queue2_unmatched_flags",                        "", createDeviceQueue2UnmatchedFlagsTest);
        addFunctionCase(deviceInitializationTests.get(), "create_instance_device_intentional_alloc_fail",       "", createInstanceDeviceIntentionalAllocFail);
 
        return deviceInitializationTests.release();
diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index bb28385..ea49838 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@ -3761,7 +3761,6 @@ dEQP-VK.api.device_init.create_device_global_priority
 dEQP-VK.api.device_init.create_device_features2
 dEQP-VK.api.device_init.create_device_unsupported_features
 dEQP-VK.api.device_init.create_device_queue2
-dEQP-VK.api.device_init.create_device_queue2_unmatched_flags
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail
 dEQP-VK.api.object_management.single.instance
 dEQP-VK.api.object_management.single.device
Domain: Graphics System / GL;