Test vkCreateInstance with NULL application info

Bug: 27531340
Change-Id: I38fd9b48535aff49cb2e30355b8cfea2ea3f0f68

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index f00f8cd80202b8abc43627288bb94992f2628cf5..e750dc487e0b7c66e5430a91d41610180a69bd85 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -3977,6 +3977,9 @@
                                <Test name="create_instance_invalid_api_version">
                                        <TestInstance/>
                                </Test>
+                               <Test name="create_instance_null_appinfo">
+                                       <TestInstance/>
+                               </Test>
                                <Test name="create_instance_unsupported_extensions">
                                        <TestInstance/>
                                </Test>

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 8a87b29dc68a10a0746c8d6ad045f6453be31e98..e0d600ea3e59c4d564e44248c7447c441a7dcf90 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -1306,6 +1306,7 @@ dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_unorm_block
 dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_srgb_block
 dEQP-VK.api.device_init.create_instance_name_version
 dEQP-VK.api.device_init.create_instance_invalid_api_version
+dEQP-VK.api.device_init.create_instance_null_appinfo
 dEQP-VK.api.device_init.create_instance_unsupported_extensions
 dEQP-VK.api.device_init.create_device
 dEQP-VK.api.device_init.create_multiple_devices

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 841c26f67c199fec78813c3e4b54b4494728f26b..47e065c4d1f203a4d23926ee3518bb714777b01a 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@ -242,6 +242,39 @@ tcu::TestStatus createInstanceWithInvalidApiVersionTest (Context& context)
        return tcu::TestStatus(resultCollector.getResult(), resultCollector.getMessage());
 }
 
+tcu::TestStatus createInstanceWithNullApplicationInfoTest (Context& context)
+{
+       tcu::TestLog&                           log                                             = context.getTestContext().getLog();
+       tcu::ResultCollector            resultCollector                 (log);
+       const PlatformInterface&        platformInterface               = context.getPlatformInterface();
+
+       const VkInstanceCreateInfo              instanceCreateInfo              =
+       {
+               VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, // VkStructureType                              sType;
+               DE_NULL,                                                                // const void*                                  pNext;
+               (VkInstanceCreateFlags)0u,                              // VkInstanceCreateFlags                flags;
+               DE_NULL,                                                                // const VkApplicationInfo*             pAppInfo;
+               0u,                                                                             // deUint32                                             layerCount;
+               DE_NULL,                                                                // const char*const*                    ppEnabledLayernames;
+               0u,                                                                             // deUint32                                             extensionCount;
+               DE_NULL,                                                                // const char*const*                    ppEnabledExtensionNames;
+       };
+
+       log << TestLog::Message << "Creating instance with NULL pApplicationInfo" << TestLog::EndMessage;
+
+       try
+       {
+               const Unique<VkInstance> instance(createInstance(platformInterface, &instanceCreateInfo));
+               log << TestLog::Message << "Succeeded" << TestLog::EndMessage;
+       }
+       catch (const vk::Error& err)
+       {
+               resultCollector.fail("Failed, Error code: " + de::toString(err.getMessage()));
+       }
+
+       return tcu::TestStatus(resultCollector.getResult(), resultCollector.getMessage());
+}
+
 tcu::TestStatus createInstanceWithUnsupportedExtensionsTest (Context& context)
 {
        tcu::TestLog&                                           log                                             = context.getTestContext().getLog();
@@ -582,6 +615,7 @@ tcu::TestCaseGroup* createDeviceInitializationTests (tcu::TestContext& testCtx)
 
        addFunctionCase(deviceInitializationTests.get(), "create_instance_name_version",                        "", createInstanceTest);
        addFunctionCase(deviceInitializationTests.get(), "create_instance_invalid_api_version",         "", createInstanceWithInvalidApiVersionTest);
+       addFunctionCase(deviceInitializationTests.get(), "create_instance_null_appinfo",                    "", createInstanceWithNullApplicationInfoTest);
        addFunctionCase(deviceInitializationTests.get(), "create_instance_unsupported_extensions",      "", createInstanceWithUnsupportedExtensionsTest);
        addFunctionCase(deviceInitializationTests.get(), "create_device",                                                       "", createDeviceTest);
        addFunctionCase(deviceInitializationTests.get(), "create_multiple_devices",                                     "", createMultipleDevicesTest);