X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fmodules%2Fvulkan%2FvktExternalMemoryUtil.hpp;h=7180a8c727b911db2b1d725a121d75d6fb60e1ff;hb=dae5394b0fadda4abdbdc964bf5dc6ee29151fc8;hp=4bc109821e196b8972c7564f44e7c0feb8ec0a92;hpb=57aec3b1fc8bbf6405d56e2c0ea20c55395e866b;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.hpp b/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.hpp
index 4bc1098..7180a8c 100644
--- a/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.hpp
+++ b/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.hpp
@@ -160,21 +160,24 @@ vk::Move<vk::VkFence>			createAndImportFence				(const vk::DeviceInterface&
 vk::Move<vk::VkDeviceMemory>	allocateExportableMemory			(const vk::DeviceInterface&					vkd,
 																	 vk::VkDevice								device,
 																	 const vk::VkMemoryRequirements&			requirements,
-																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType);
+																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
+																	 deUint32&									exportedMemoryTypeIndex);
 
 // If buffer is not null use dedicated allocation
 vk::Move<vk::VkDeviceMemory>	allocateExportableMemory			(const vk::DeviceInterface&					vkd,
 																	 vk::VkDevice								device,
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
-																	 vk::VkBuffer								buffer);
+																	 vk::VkBuffer								buffer,
+																	 deUint32&									exportedMemoryTypeIndex);
 
 // If image is not null use dedicated allocation
 vk::Move<vk::VkDeviceMemory>	allocateExportableMemory			(const vk::DeviceInterface&					vkd,
 																	 vk::VkDevice								device,
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
-																	 vk::VkImage								image);
+																	 vk::VkImage								image,
+																	 deUint32&									exportedMemoryTypeIndex);
 
 // \note hostVisible argument is strict. Setting it to false will cause NotSupportedError to be thrown if non-host visible memory doesn't exist.
 // If buffer is not null use dedicated allocation
@@ -185,12 +188,14 @@ vk::Move<vk::VkDeviceMemory>	allocateExportableMemory			(const vk::InstanceInter
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
 																	 bool										hostVisible,
-																	 vk::VkBuffer								buffer);
+																	 vk::VkBuffer								buffer,
+																	 deUint32&									exportedMemoryTypeIndex);
 
 vk::Move<vk::VkDeviceMemory>	importMemory						(const vk::DeviceInterface&					vkd,
 																	 vk::VkDevice								device,
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
+																	 deUint32									memoryTypeIndex,
 																	 NativeHandle&								handle);
 
 vk::Move<vk::VkDeviceMemory>	importDedicatedMemory				(const vk::DeviceInterface&					vkd,
@@ -198,6 +203,7 @@ vk::Move<vk::VkDeviceMemory>	importDedicatedMemory				(const vk::DeviceInterface
 																	 vk::VkBuffer								buffer,
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
+																	 deUint32									memoryTypeIndex,
 																	 NativeHandle&								handle);
 
 vk::Move<vk::VkDeviceMemory>	importDedicatedMemory				(const vk::DeviceInterface&					vkd,
@@ -205,6 +211,7 @@ vk::Move<vk::VkDeviceMemory>	importDedicatedMemory				(const vk::DeviceInterface
 																	 vk::VkImage								image,
 																	 const vk::VkMemoryRequirements&			requirements,
 																	 vk::VkExternalMemoryHandleTypeFlagBitsKHR	externalType,
+																	 deUint32									memoryTypeIndex,
 																	 NativeHandle&								handle);
 
 vk::Move<vk::VkBuffer>			createExternalBuffer				(const vk::DeviceInterface&					vkd,