Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3

Change-Id: Idd75718ac2bbe801270c6941becf6a23f4b861b0

diff --cc external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 4b84a2d,12dab26..89c4551
--- 1/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@@ -1030,37 -965,22 +1032,37 @@@ tcu::TestStatus createDeviceWithGlobalP
                        queuePriorities.data()                                          //pQueuePriorities;
                };
  
 -              const VkDeviceCreateInfo                deviceCreateInfo        =
 +              void* pNext                                                                                             = DE_NULL;
 +#ifdef CTS_USES_VULKANSC
 +              VkDeviceObjectReservationCreateInfo memReservationInfo  = context.getTestContext().getCommandLine().isSubProcess() ? context.getResourceInterface()->getStatMax() : resetDeviceObjectReservationCreateInfo();
 +              memReservationInfo.pNext                                                                = pNext;
 +              pNext                                                                                                   = &memReservationInfo;
 +
 +              VkPhysicalDeviceVulkanSC10Features sc10Features                 = createDefaultSC10Features();
 +              sc10Features.pNext                                                                              = pNext;
 +              pNext                                                                                                   = &sc10Features;
 +#else
-               pNext = &globalPriorityQueryFeatures;
++              pNext = useKhrGlobalPriority ? &globalPriorityQueryFeatures : DE_NULL;
 +#endif // CTS_USES_VULKANSC
 +
 +              const VkDeviceCreateInfo                deviceCreateInfo                =
                {
-                       VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,   //sType;
-                       pNext,                                                                  //pNext;
-                       (VkDeviceCreateFlags)0u,                                //flags;
-                       1,                                                                              //queueRecordCount;
-                       &queueCreateInfo,                                               //pRequestedQueues;
-                       0,                                                                              //layerCount;
-                       DE_NULL,                                                                //ppEnabledLayerNames;
-                       (deUint32)enabledExtensions.size(),             //extensionCount;
-                       enabledExtensions.data(),                               //ppEnabledExtensionNames;
-                       DE_NULL,                                                                //pEnabledFeatures;
+                       VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,                                                   //sType;
 -                      useKhrGlobalPriority ? &globalPriorityQueryFeatures : DE_NULL,  //pNext;
++                      pNext,                                                                                                                  //pNext;
+                       (VkDeviceCreateFlags)0u,                                                                                //flags;
+                       1,                                                                                                                              //queueRecordCount;
+                       &queueCreateInfo,                                                                                               //pRequestedQueues;
+                       0,                                                                                                                              //layerCount;
+                       DE_NULL,                                                                                                                //ppEnabledLayerNames;
+                       (deUint32)enabledExtensions.size(),                                                             //extensionCount;
+                       enabledExtensions.data(),                                                                               //ppEnabledExtensionNames;
+                       DE_NULL,                                                                                                                //pEnabledFeatures;
                };
  
                const bool              mayBeDenied                             = globalPriority > VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT;
-               const bool              mustFail                                = globalPriority < globalPriorityProperties[0].priorities[0] || globalPriority > globalPriorityProperties[0].priorities[globalPriorityProperties[0].priorityCount - 1];
 +#ifndef CTS_USES_VULKANSC
+               const bool              mustFail                                = useKhrGlobalPriority && (globalPriority < globalPriorityProperties[0].priorities[0] || globalPriority > globalPriorityProperties[0].priorities[globalPriorityProperties[0].priorityCount - 1]);
 +#endif // CTS_USES_VULKANSC
  
                try
                {

diff --cc external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp
Simple merge