Fix instance creation

Pass parameters in the right order when
creating a temporary instance to allow
tests to be skipped when features are not
supported.

Affects: dEQP-VK.api.external.semaphore.sync_fd.import_signaled_temporary
Affects: dEQP-VK.api.external.memory.android_hardware_buffer.image_formats.*

Components: Vulkan
VK-GL-CTS issue: 2689

Change-Id: Iba9490debc4870f158b30295930783e2291c4f77

diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index 926fd7f..966f040 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -1168,7 +1168,7 @@ tcu::TestStatus testSemaphoreImportSyncFdSignaled (Context&                                               context,
                                                                                                   const SemaphoreTestConfig    config)
 {
        const vk::PlatformInterface&            vkp                                     (context.getPlatformInterface());
-       const CustomInstance                            instance                        (createTestInstance(context, 0u, 0u, config.externalType));
+       const CustomInstance                            instance                        (createTestInstance(context, config.externalType, 0u, 0u));
        const vk::InstanceDriver&                       vki                                     (instance.getDriver());
        const vk::VkPhysicalDevice                      physicalDevice          (vk::chooseDevice(vki, instance, context.getTestContext().getCommandLine()));
        const deUint32                                          queueFamilyIndex        (chooseQueueFamilyIndex(vki, physicalDevice, 0u));
@@ -4073,7 +4073,7 @@ tcu::TestStatus testAndroidHardwareBufferImageFormat  (Context& context, vk::VkF
 
        const vk::VkExternalMemoryHandleTypeFlagBits  externalMemoryType  =     vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
        const vk::PlatformInterface&                              vkp                                   (context.getPlatformInterface());
-       const CustomInstance                                              instance                              (createTestInstance(context, externalMemoryType, 0u, 0u));
+       const CustomInstance                                              instance                              (createTestInstance(context, 0u, externalMemoryType, 0u));
        const vk::InstanceDriver&                                         vki                                   (instance.getDriver());
        const vk::VkPhysicalDevice                                        physicalDevice                (vk::chooseDevice(vki, instance, context.getTestContext().getCommandLine()));
        const deUint32                                                            queueFamilyIndex              (chooseQueueFamilyIndex(vki, physicalDevice, 0u));