Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

Change-Id: I353dac50e06609d2783125bf22aee21f27c9939a
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index ccafd67..65f1dda 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -2038,10 +2038,8 @@
 		VK_CHECK(vkd.queueWaitIdle(queue));
 
 		submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle);
-		{
-			NativeHandle					handleB	(handle);
-			importFence(vkd, *device, *fenceB, config.externalType, handleB, flags);
-		}
+		NativeHandle					handleB	(handle);
+		importFence(vkd, *device, *fenceB, config.externalType, handleB, flags);
 		importFence(vkd, *device, *fenceC, config.externalType, handle, flags);
 
 		VK_CHECK(vkd.queueWaitIdle(queue));
diff --git a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
index 5fd14c9..3eaf29b 100644
--- a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
+++ b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
@@ -648,7 +648,7 @@
 	{
 		const vk::VkImportFenceWin32HandleInfoKHR	importInfo	=
 		{
-			vk::VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR,
+			vk::VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR,
 			DE_NULL,
 			fence,
 			flags,
@@ -658,8 +658,8 @@
 		};
 
 		VK_CHECK(vkd.importFenceWin32HandleKHR(device, &importInfo));
-		// \note File descriptors and win32 handles behave differently, but this call wil make it seem like they would behave in same way
-		handle.reset();
+		// \note Importing a fence payload from Windows handles does not transfer ownership of the handle to the Vulkan implementation,
+		//   so we do not disown the handle until after all use has complete.
 	}
 	else
 		DE_FATAL("Unknown fence external handle type");
@@ -803,7 +803,7 @@
 	{
 		const vk::VkImportSemaphoreWin32HandleInfoKHR	importInfo	=
 		{
-			vk::VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
+			vk::VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR,
 			DE_NULL,
 			semaphore,
 			flags,
@@ -813,8 +813,8 @@
 		};
 
 		VK_CHECK(vkd.importSemaphoreWin32HandleKHR(device, &importInfo));
-		// \note File descriptors and win32 handles behave differently, but this call wil make it seem like they would behave in same way
-		handle.reset();
+		// \note Importing a semaphore payload from Windows handles does not transfer ownership of the handle to the Vulkan implementation,
+		//   so we do not disown the handle until after all use has complete.
 	}
 	else
 		DE_FATAL("Unknown semaphore external handle type");