From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 14 Dec 2017 15:37:34 +0000 (+0100)
Subject: Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-next-dev
X-Git-Tag: upstream/1.3.5~2565^2~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=583a4fe6359161aba09c646648888e9fab313af1;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I55a35ef1ef4db8f2605e666931fbf791716794e5
---

583a4fe6359161aba09c646648888e9fab313af1
diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
index d56cd0d,7626dd8..01b4d87
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
@@@ -135,9 -135,9 +135,9 @@@ public
  				readOp.getResourceUsageFlags() | writeOp.getResourceUsageFlags(),
  				0u
  			};
- 			vk::VkExternalImageFormatProperties			externalProperties	=
+ 			vk::VkExternalImageFormatProperties				externalProperties	=
  			{
 -				vk::VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR,
 +				vk::VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
  				DE_NULL,
  				{ 0u, 0u, 0u }
  			};