From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 12 Sep 2019 18:10:05 +0000 (+0100)
Subject: Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/master
X-Git-Tag: upstream/1.3.5~1879
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43ad6a84a07b504f99868e5239b87982d7ed8749;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: Id7429810f24dcf55956635c88a6fdf77cfcf6f9c
---

43ad6a84a07b504f99868e5239b87982d7ed8749
diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index f8d0444,56ef508..f4abfa6
--- a/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");