From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 16 Jan 2020 17:51:40 +0000 (+0100)
Subject: Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/master
X-Git-Tag: upstream/1.3.5~1623
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b389c2911ab9ca15fd2583578ce80176243909e5;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: I05f8e0d8240f265b9e150f37e580850e7a259a08
---

b389c2911ab9ca15fd2583578ce80176243909e5
diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
index 743756f,08f1dc6..8ccd654
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
@@@ -116,15 -116,10 +116,15 @@@ public
  			|| config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR
  			|| config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR)
  		{
- 			requireDeviceExtension("VK_KHR_external_semaphore_fd");
- 			requireDeviceExtension("VK_KHR_external_memory_fd");
+ 			m_context.requireDeviceFunctionality("VK_KHR_external_semaphore_fd");
+ 			m_context.requireDeviceFunctionality("VK_KHR_external_memory_fd");
  		}
  
 +		if (config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT)
 +		{
- 			requireDeviceExtension("VK_EXT_external_memory_dma_buf");
++			m_context.requireDeviceFunctionality("VK_EXT_external_memory_dma_buf");
 +		}
 +
  		if (config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR
  			|| config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR
  			|| config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR
@@@ -1326,14 -1351,9 +1359,14 @@@ static void createTests (tcu::TestCaseG
  			vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT,
  			"_win32"
  		},
 +		{
 +			vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
 +			vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT,
 +			"_dma_buf"
 +		},
  	};
  
- 	const std::string semaphoreNames[vk::VK_SEMAPHORE_TYPE_KHR_LAST] =
+ 	const std::string semaphoreNames[vk::VK_SEMAPHORE_TYPE_LAST] =
  	{
  		"_binary_semaphore",
  		"_timeline_semaphore",