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

Change-Id: Ib92b3d3b2282186df729d4694083ccaec6e3c525

diff --cc external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index ddf75b3,896f7e3..dd79435
--- 1/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@@ -989,8 -926,16 +989,21 @@@ tcu::TestStatus createDeviceWithGlobalP
  
        instanceDriver.getPhysicalDeviceQueueFamilyProperties2(physicalDevice, &queueFamilyPropertyCount, queueFamilyProperties2.data());
        TCU_CHECK((size_t)queueFamilyPropertyCount == queueFamilyProperties2.size());
+ 
+       std::vector<const char*> enabledExtensions = { "VK_EXT_global_priority", "VK_EXT_global_priority_query" };
++
+       if (useKhrGlobalPriority)
+               enabledExtensions = { "VK_KHR_global_priority" };
++#else
++      (void)useKhrGlobalPriority;
++      std::vector<const char*> enabledExtensions = { "VK_EXT_global_priority" };
 +#endif // CTS_USES_VULKANSC
  
 -      if (!context.contextSupports(vk::ApiVersion(1, 1, 0)))
++      if (!context.contextSupports(vk::ApiVersion(0, 1, 1, 0)))
+       {
+               enabledExtensions.emplace_back("VK_KHR_get_physical_device_properties2");
+       }
+ 
        for (VkQueueGlobalPriorityEXT globalPriority : globalPriorities)
        {
                const VkDeviceQueueGlobalPriorityCreateInfoEXT  queueGlobalPriority             =

diff --cc external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
index 765842c,dcb1232..6228c76
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
@@@ -340,7 -339,10 +340,16 @@@ void checkSupportImageSamplingInstance 
                        TCU_THROW(NotSupportedError, "VK_KHR_portability_subset: Implementation does not support remapping format components");
                }
        }
 -      if (params.imageFormat == VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16 && params.subresourceRange.levelCount > 1 && context.getRGBA10X6FormatsFeaturesEXT().formatRgba10x6WithoutYCbCrSampler == VK_FALSE) {
+ 
++      bool formatRgba10x6WithoutYCbCrSampler = context.getRGBA10X6FormatsFeaturesEXT().formatRgba10x6WithoutYCbCrSampler;
++#else
++      bool formatRgba10x6WithoutYCbCrSampler = VK_FALSE;
 +#endif // CTS_USES_VULKANSC
++
++      if ((params.imageFormat == VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16) && (params.subresourceRange.levelCount > 1) && (formatRgba10x6WithoutYCbCrSampler == VK_FALSE))
++      {
+               TCU_THROW(NotSupportedError, "formatRgba10x6WithoutYCbCrSampler not supported");
+       }
  }
  
  ImageSamplingInstance::ImageSamplingInstance (Context&                                                context,

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp
Simple merge