Fix build for concurrent draw tests

These tests didn't build following the change to consolidate the helper
functions.

Components: Vulkan
Affects: dEQP-VK.draw.concurrent.compute_and_triangle_list

Change-Id: Ide173aa67ce7e2db77c66ab7ff299b9a275fdf01

diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawConcurrentTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawConcurrentTests.cpp
index 7abd8a0..f0d693d 100644 (file)
--- a/external/vulkancts/modules/vulkan/draw/vktDrawConcurrentTests.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawConcurrentTests.cpp
@@ -210,11 +210,11 @@ tcu::TestStatus ConcurrentDraw::iterate (void)
 
        const Unique<VkShaderModule>            shaderModule(createShaderModule(vk, *computeDevice, m_context.getBinaryCollection().get("vulkan/draw/ConcurrentPayload.comp"), 0u));
 
-       const Unique<VkPipelineLayout>          pipelineLayout(vkt::compute::makePipelineLayout(vk, *computeDevice, *descriptorSetLayout));
+       const Unique<VkPipelineLayout>          pipelineLayout(makePipelineLayout(vk, *computeDevice, *descriptorSetLayout));
        const Unique<VkPipeline>                        pipeline(vkt::compute::makeComputePipeline(vk, *computeDevice, *pipelineLayout, *shaderModule));
        const VkBufferMemoryBarrier                     hostWriteBarrier        = makeBufferMemoryBarrier(VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, *buffer, 0ull, bufferSizeBytes);
        const VkBufferMemoryBarrier                     shaderWriteBarrier      = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *buffer, 0ull, bufferSizeBytes);
-       const Unique<VkCommandPool>                     cmdPool(vkt::compute::makeCommandPool(vk, *computeDevice, computeQueue.queueFamilyIndex));
+       const Unique<VkCommandPool>                     cmdPool(makeCommandPool(vk, *computeDevice, computeQueue.queueFamilyIndex));
        const Unique<VkCommandBuffer>           computeCommandBuffer(allocateCommandBuffer(vk, *computeDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY));
 
        // Compute command buffer