Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: I2a0e4c9ff079fa45ea23994cafeaae72ec97831b

diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
index bfff9355bbd8034a36626f68e4d21747a2229f03,6a8f55460c5059ca41af1a0cf27d19e270f65eb1..93aa47453e180041e2f5d52420ce35e06d0462dc
--- 1/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
--- 2/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
@@@ -2854,16 -2859,16 +2854,16 @@@ void TexelViewCompatibleCase::checkSupp
        {
                VkImageFormatProperties imageFormatProperties;
  
 -              if (VK_ERROR_FORMAT_NOT_SUPPORTED == vk.getPhysicalDeviceImageFormatProperties(physicalDevice, m_parameters.formatUncompressed,
 -                                                                                              mapImageType(m_parameters.imageType), VK_IMAGE_TILING_OPTIMAL,
 -                                                                                              m_parameters.uncompressedImageUsage, 0u, &imageFormatProperties))
 +              if (vk.getPhysicalDeviceImageFormatProperties(physicalDevice, m_parameters.formatUncompressed,
 +                                                                                                        mapImageType(m_parameters.imageType), VK_IMAGE_TILING_OPTIMAL,
 +                                                                                                        m_parameters.uncompressedImageUsage, 0u, &imageFormatProperties) == VK_ERROR_FORMAT_NOT_SUPPORTED)
                        TCU_THROW(NotSupportedError, "Operation not supported with this image format");
  
-               if (vk.getPhysicalDeviceImageFormatProperties(physicalDevice, m_parameters.formatCompressed,
-                                                                                                         mapImageType(m_parameters.imageType), VK_IMAGE_TILING_OPTIMAL,
-                                                                                                         m_parameters.compressedImageUsage,
-                                                                                                         VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR | VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR,
-                                                                                                         &imageFormatProperties) == VK_ERROR_FORMAT_NOT_SUPPORTED)
+               if (VK_ERROR_FORMAT_NOT_SUPPORTED == vk.getPhysicalDeviceImageFormatProperties(physicalDevice, m_parameters.formatCompressed,
+                                                                                               mapImageType(m_parameters.imageType), VK_IMAGE_TILING_OPTIMAL,
+                                                                                               m_parameters.compressedImageUsage,
+                                                                                               VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR | VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR,
+                                                                                               &imageFormatProperties))
                        TCU_THROW(NotSupportedError, "Operation not supported with this image format");
        }