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

Change-Id: Id7429810f24dcf55956635c88a6fdf77cfcf6f9c

diff --cc external/fetch_sources.py
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index f8d0444,56ef508..f4abfa6
--- 1/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
--- 2/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
@@@ -932,13 -935,19 +932,18 @@@ LoadStoreTest::LoadStoreTest (tcu::Test
  
  void LoadStoreTest::checkSupport (Context& context) const
  {
-       const VkFormatProperties formatProperties (getPhysicalDeviceFormatProperties(context.getInstanceInterface(), context.getPhysicalDevice(), m_format));
 -      const VkPhysicalDeviceFeatures  features                        (context.getDeviceFeatures());
+       const vk::VkFormatProperties    formatProperties        (vk::getPhysicalDeviceFormatProperties(context.getInstanceInterface(),
+                                                                                                                                                                                          context.getPhysicalDevice(),
+                                                                                                                                                                                          m_format));
+       const vk::VkFormatProperties imageFormatProperties  (vk::getPhysicalDeviceFormatProperties(context.getInstanceInterface(),
+                                                                                                                                                                                          context.getPhysicalDevice(),
+                                                                                                                                                                                          m_imageFormat));
  
 -      if (!m_declareImageFormatInShader && !features.shaderStorageImageReadWithoutFormat)
 -              TCU_THROW(NotSupportedError, "shaderStorageImageReadWithoutFormat feature not supported");
 +      if (!m_declareImageFormatInShader)
 +              context.requireDeviceCoreFeature(DEVICE_CORE_FEATURE_SHADER_STORAGE_IMAGE_READ_WITHOUT_FORMAT);
  
 -      if (m_texture.type() == IMAGE_TYPE_CUBE_ARRAY && !features.imageCubeArray)
 -              TCU_THROW(NotSupportedError, "imageCubeArray feature not supported");
 +      if (m_texture.type() == IMAGE_TYPE_CUBE_ARRAY)
 +              context.requireDeviceCoreFeature(DEVICE_CORE_FEATURE_IMAGE_CUBE_ARRAY);
  
        if ((m_texture.type() != IMAGE_TYPE_BUFFER) && !(formatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT))
                TCU_THROW(NotSupportedError, "Format not supported for storage images");

diff --cc external/vulkancts/modules/vulkan/imageless_framebuffer/vktImagelessFramebufferTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
Simple merge