Add create functions for common Vulkan types.

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / spirv_assembly / vktSpvAsmInstructionTests.cpp

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index f828de8..5aafc4b 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -5395,25 +5395,10 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
        };
        const Unique<VkFramebuffer>                             framebuffer                             (createFramebuffer(vk, vkDevice, &framebufferParams));
 
-       const VkCommandPoolCreateInfo                   cmdPoolParams                   =
-       {
-               VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,                                     //      VkStructureType                 sType;
-               DE_NULL,                                                                                                        //      const void*                             pNext;
-               VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,                                //      VkCmdPoolCreateFlags    flags;
-               queueFamilyIndex,                                                                                       //      deUint32                                queueFamilyIndex;
-       };
-       const Unique<VkCommandPool>                             cmdPool                                 (createCommandPool(vk, vkDevice, &cmdPoolParams));
+       const Unique<VkCommandPool>                             cmdPool                                 (createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex));
 
        // Command buffer
-       const VkCommandBufferAllocateInfo               cmdBufParams                    =
-       {
-               VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,                 //      VkStructureType                 sType;
-               DE_NULL,                                                                                                //      const void*                             pNext;
-               *cmdPool,                                                                                               //      VkCmdPool                               pool;
-               VK_COMMAND_BUFFER_LEVEL_PRIMARY,                                                //      VkCmdBufferLevel                level;
-               1u,                                                                                                             //      deUint32                                count;
-       };
-       const Unique<VkCommandBuffer>                   cmdBuf                                  (allocateCommandBuffer(vk, vkDevice, &cmdBufParams));
+       const Unique<VkCommandBuffer>                   cmdBuf                                  (allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY));
 
        const VkCommandBufferBeginInfo                  cmdBufBeginParams               =
        {
@@ -5556,13 +5541,7 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
 
        // Submit & wait for completion
        {
-               const VkFenceCreateInfo fenceParams     =
-               {
-                       VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,    //      VkStructureType         sType;
-                       DE_NULL,                                                                //      const void*                     pNext;
-                       0u,                                                                             //      VkFenceCreateFlags      flags;
-               };
-               const Unique<VkFence>   fence           (createFence(vk, vkDevice, &fenceParams));
+               const Unique<VkFence>   fence           (createFence(vk, vkDevice));
                const VkSubmitInfo              submitInfo      =
                {
                        VK_STRUCTURE_TYPE_SUBMIT_INFO,