modifiers: Use dedicated memory consistently

When a dedicated allocation device memory object
is exported, it must be imported as a dedicated
allocation created with a compatible resource as
well.  This change makes the DRM format modifier
tests self-consistent in that regard.

Components: Vulkan

Affected tests: dEQP-VK.drm_format_modifiers.export_import.*

VK-GL-CTS issue: 3544

Change-Id: I93a35180b9a5a1b98e0d4fa1f2934258134cef1b

diff --git a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
index 6bf5ce4..e7cfa3f 100644 (file)
--- a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
+++ b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
@@ -590,10 +590,10 @@ bool exportImportMemoryExplicitModifiersCase (Context& context, const VkFormat f
 
        VkMemoryRequirements importedSrcImageMemoryReq = getImageMemoryRequirements(vkd, device, *importedSrcImage);
 
-       Move<VkDeviceMemory>                                            importedMemory (vkt::ExternalMemoryUtil::importMemory(vkd, device,
-                                                                                                                                                                                                       importedSrcImageMemoryReq,
-                                                                                                                                                                                                       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
-                                                                                                                                                                                                       ~0u, inputImageMemFd));
+       Move<VkDeviceMemory>                                            importedMemory (vkt::ExternalMemoryUtil::importDedicatedMemory(vkd, device, *importedSrcImage,
+                                                                                                               importedSrcImageMemoryReq,
+                                                                                                               VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
+                                                                                                               ~0u, inputImageMemFd));
        VK_CHECK(vkd.bindImageMemory(device, *importedSrcImage, *importedMemory, 0));
 
        Move<VkImage>                                           outImage                (createImageNoModifiers(vkd, device,