Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/master

Change-Id: I0d8d57b196da13538a026a3abea3ebd6b6ed0cde

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 9fa5b3d..472ef0c 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@ -1247,10 +1247,12 @@ std::vector<AllocTrack> g_allocatedVector;
 bool                                   g_intentionalFailEnabled        = false;
 deUint32                               g_intenionalFailIndex           = 0;
 deUint32                               g_intenionalFailCount           = 0;
+size_t                                 g_allocationsCount                      = 0;
 
 void freeAllocTracker (void)
 {
        g_allocatedVector.clear();
+       g_allocationsCount = 0;
 }
 
 void initAllocTracker (size_t size, deUint32 intentionalFailIndex = (deUint32)~0)
@@ -1272,6 +1274,8 @@ void initAllocTracker (size_t size, deUint32 intentionalFailIndex = (deUint32)~0
                g_intenionalFailIndex           = 0;
                g_intenionalFailCount           = 0;
        }
+
+       g_allocationsCount = 0;
 }
 
 bool isAllocTrackerEmpty ()
@@ -1320,6 +1324,7 @@ VKAPI_ATTR void *VKAPI_CALL allocCallbackFunc (void *pUserData, size_t size, siz
                                g_allocatedVector[vectorIdx].wasAllocated                       = true;
                        }
 
+                       g_allocationsCount++;
                        return g_allocatedVector[vectorIdx].alignedStartAddress;
                }
        }
@@ -1421,14 +1426,25 @@ tcu::TestStatus createInstanceDeviceIntentionalAllocFail (Context& context)
                DE_NULL                                                                 // ppEnabledExtensionNames
        };
        deUint32                                        failIndex                       = 0;
-       VkResult                                        result                          = VK_ERROR_OUT_OF_HOST_MEMORY;
+       VkResult                                        result                          = VK_SUCCESS;
+       size_t                                          max_allowed_alloc       = 0;
 
-       while (result == VK_ERROR_OUT_OF_HOST_MEMORY)
+       do
        {
-               initAllocTracker(9999, failIndex++);
+               if (max_allowed_alloc == 0)
+               {
+                       if (result != VK_SUCCESS)
+                               return tcu::TestStatus::fail("Could not create instance and device");
+
+                       initAllocTracker(99999);
+               }
+               else
+               {
+                       initAllocTracker(max_allowed_alloc, failIndex++);
 
-               if (failIndex >= 9999u)
-                       return tcu::TestStatus::fail("Out of retries, could not create instance and device");
+                       if (failIndex >= static_cast<deUint32>(max_allowed_alloc))
+                               return tcu::TestStatus::fail("Out of retries, could not create instance and device");
+               }
 
                result = vkp.createInstance(&instanceCreateInfo, &allocationCallbacks, &instance);
 
@@ -1539,8 +1555,14 @@ tcu::TestStatus createInstanceDeviceIntentionalAllocFail (Context& context)
 
                DeviceDriver(vkp, instance, device).destroyDevice(device, &allocationCallbacks);
                vki.destroyInstance(instance, &allocationCallbacks);
+               if (max_allowed_alloc == 0)
+               {
+                       max_allowed_alloc       = g_allocationsCount + 100;
+                       result                          = VK_ERROR_OUT_OF_HOST_MEMORY;
+               }
                freeAllocTracker();
        }
+       while (result == VK_ERROR_OUT_OF_HOST_MEMORY);
 
        return tcu::TestStatus::pass("Pass");
 }