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

Change-Id: I138bdc04aecc86f159b8b755ad80fb9f84b11681

diff --cc external/fetch_sources.py
Simple merge

diff --cc external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 934af15,5467701..fb50a02
--- 1/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -65,25 -65,25 +65,26 @@@ static const deUint32 knownDriverIds[] 
  
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 -      makeConformanceVersionKHR(1, 1, 5, 1),
 -      makeConformanceVersionKHR(1, 1, 5, 0),
 -      makeConformanceVersionKHR(1, 1, 4, 3),
 -      makeConformanceVersionKHR(1, 1, 4, 2),
 -      makeConformanceVersionKHR(1, 1, 4, 1),
 -      makeConformanceVersionKHR(1, 1, 4, 0),
 -      makeConformanceVersionKHR(1, 1, 3, 3),
 -      makeConformanceVersionKHR(1, 1, 3, 2),
 -      makeConformanceVersionKHR(1, 1, 3, 1),
 -      makeConformanceVersionKHR(1, 1, 3, 0),
 -      makeConformanceVersionKHR(1, 1, 2, 3),
 -      makeConformanceVersionKHR(1, 1, 2, 2),
 -      makeConformanceVersionKHR(1, 1, 2, 1),
 -      makeConformanceVersionKHR(1, 1, 2, 0),
 -      makeConformanceVersionKHR(1, 1, 1, 3),
 -      makeConformanceVersionKHR(1, 1, 1, 2),
 -      makeConformanceVersionKHR(1, 1, 1, 1),
 -      makeConformanceVersionKHR(1, 1, 1, 0),
 -      makeConformanceVersionKHR(1, 1, 0, 3),
 +      makeConformanceVersion(1, 2, 0, 0),
++      makeConformanceVersion(1, 1, 5, 1),
 +      makeConformanceVersion(1, 1, 5, 0),
 +      makeConformanceVersion(1, 1, 4, 3),
 +      makeConformanceVersion(1, 1, 4, 2),
 +      makeConformanceVersion(1, 1, 4, 1),
 +      makeConformanceVersion(1, 1, 4, 0),
 +      makeConformanceVersion(1, 1, 3, 3),
 +      makeConformanceVersion(1, 1, 3, 2),
 +      makeConformanceVersion(1, 1, 3, 1),
 +      makeConformanceVersion(1, 1, 3, 0),
 +      makeConformanceVersion(1, 1, 2, 3),
 +      makeConformanceVersion(1, 1, 2, 2),
 +      makeConformanceVersion(1, 1, 2, 1),
 +      makeConformanceVersion(1, 1, 2, 0),
 +      makeConformanceVersion(1, 1, 1, 3),
 +      makeConformanceVersion(1, 1, 1, 2),
 +      makeConformanceVersion(1, 1, 1, 1),
 +      makeConformanceVersion(1, 1, 1, 0),
 +      makeConformanceVersion(1, 1, 0, 3),
  };
  
  DE_INLINE bool isNullTerminated(const char* str, const deUint32 maxSize)

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index e5d1e5b,56ef508..3ee00fc
--- 1/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
--- 2/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
@@@ -934,13 -935,19 +934,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
index 570acd0,03ea711..e573f59
--- 1/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
--- 2/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
@@@ -255,13 -251,13 +255,13 @@@ bool DepthStencilResolveTest::isFeature
        {
                if ((!dsResolveProperties.independentResolve) &&
                        (depthResolveMode != stencilResolveMode) &&
 -                      (depthResolveMode != VK_RESOLVE_MODE_NONE_KHR) &&
 -                      (stencilResolveMode != VK_RESOLVE_MODE_NONE_KHR))
 +                      (depthResolveMode != VK_RESOLVE_MODE_NONE) &&
 +                      (stencilResolveMode != VK_RESOLVE_MODE_NONE))
                        TCU_THROW(NotSupportedError, "Implementation doesn't support diferent resolve modes");
        }
-       else if (depthResolveMode != stencilResolveMode)
+       else if (!dsResolveProperties.independentResolve && (depthResolveMode != stencilResolveMode))
        {
-               // when independentResolveNone is VK_FALSE then both modes must be the same
+               // when independentResolveNone and independentResolve are VK_FALSE then both modes must be the same
                TCU_THROW(NotSupportedError, "Implementation doesn't support diferent resolve modes");
        }