From da03200a87f51bed33b3c3030ecbb6df06ff4f60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Tue, 7 Feb 2017 16:37:51 -0800 Subject: [PATCH] Add create functions for common Vulkan types. These functions simplify creating the Vulkan objects by taking the arguments directly instead of passing through struct. Multiple test cases already reimplement these functions. Change-Id: I09f6b0163b5aa2198617230767cd072185afe45c --- .../vulkancts/framework/vulkan/vkQueryUtil.cpp | 9 + .../vulkancts/framework/vulkan/vkQueryUtil.hpp | 2 + external/vulkancts/framework/vulkan/vkRefUtil.cpp | 84 ++++ external/vulkancts/framework/vulkan/vkRefUtil.hpp | 26 ++ .../modules/vulkan/api/vktApiBufferTests.cpp | 13 +- .../vulkan/api/vktApiBufferViewAccessTests.cpp | 34 +- .../vulkan/api/vktApiCommandBuffersTests.cpp | 486 +++------------------ .../vulkan/api/vktApiCopiesAndBlittingTests.cpp | 36 +- .../vulkan/api/vktApiDeviceInitializationTests.cpp | 19 +- .../modules/vulkan/api/vktApiFillBufferTests.cpp | 36 +- .../vulkan/api/vktApiGetMemoryCommitment.cpp | 34 +- .../modules/vulkan/api/vktApiGranularityTests.cpp | 26 +- .../vulkan/api/vktApiImageClearingTests.cpp | 30 +- .../binding_model/vktBindingShaderAccessTests.cpp | 111 +---- .../compute/vktComputeBasicComputeShaderTests.cpp | 24 +- .../vktComputeIndirectComputeDispatchTests.cpp | 2 +- .../compute/vktComputeShaderBuiltinVarTests.cpp | 2 +- .../modules/vulkan/compute/vktComputeTestsUtil.cpp | 21 +- .../modules/vulkan/compute/vktComputeTestsUtil.hpp | 4 - .../modules/vulkan/draw/vktBasicDrawTests.cpp | 13 +- .../modules/vulkan/draw/vktDrawBaseClass.cpp | 13 +- .../modules/vulkan/draw/vktDrawImageObjectUtil.cpp | 45 +- .../modules/vulkan/draw/vktDrawInstancedTests.cpp | 10 +- .../draw/vktDrawNegativeViewportHeightTests.cpp | 23 +- .../dynamic_state/vktDynamicStateDSTests.cpp | 11 +- .../dynamic_state/vktDynamicStateRSTests.cpp | 11 +- .../vktFragmentOperationsEarlyFragmentTests.cpp | 4 +- .../fragment_ops/vktFragmentOperationsMakeUtil.cpp | 33 +- .../fragment_ops/vktFragmentOperationsMakeUtil.hpp | 2 - ...FragmentOperationsScissorMultiViewportTests.cpp | 4 +- .../vktFragmentOperationsScissorTests.cpp | 4 +- .../vulkan/geometry/vktGeometryBasicClass.cpp | 4 +- .../vktGeometryBasicGeometryShaderTests.cpp | 20 +- .../vktGeometryInstancedRenderingTests.cpp | 4 +- .../geometry/vktGeometryLayeredRenderingTests.cpp | 4 +- .../vulkan/geometry/vktGeometryTestsUtil.cpp | 33 +- .../vulkan/geometry/vktGeometryTestsUtil.hpp | 2 - .../vulkan/image/vktImageAtomicOperationTests.cpp | 4 +- .../vulkan/image/vktImageLoadStoreTests.cpp | 4 +- .../image/vktImageMultisampleLoadStoreTests.cpp | 6 +- .../vulkan/image/vktImageQualifiersTests.cpp | 4 +- .../modules/vulkan/image/vktImageSizeTests.cpp | 4 +- .../modules/vulkan/image/vktImageTestsUtil.cpp | 33 +- .../modules/vulkan/image/vktImageTestsUtil.hpp | 8 - .../memory/vktMemoryPipelineBarrierTests.cpp | 38 +- .../vulkan/pipeline/vktPipelineBlendTests.cpp | 34 +- .../vulkan/pipeline/vktPipelineCacheTests.cpp | 36 +- .../vulkan/pipeline/vktPipelineDepthTests.cpp | 34 +- .../pipeline/vktPipelineImageSamplingInstance.cpp | 34 +- .../vulkan/pipeline/vktPipelineImageUtil.cpp | 70 +-- .../pipeline/vktPipelineInputAssemblyTests.cpp | 34 +- .../vulkan/pipeline/vktPipelineMakeUtil.cpp | 30 +- .../vulkan/pipeline/vktPipelineMakeUtil.hpp | 1 - .../pipeline/vktPipelineMultisampleBaseResolve.cpp | 2 +- ...lineMultisampleBaseResolveAndPerSampleFetch.cpp | 2 +- .../pipeline/vktPipelineMultisampleImageTests.cpp | 6 +- .../pipeline/vktPipelineMultisampleTests.cpp | 34 +- .../pipeline/vktPipelinePushConstantTests.cpp | 66 +-- .../pipeline/vktPipelineRenderToImageTests.cpp | 2 +- .../pipeline/vktPipelineSpecConstantTests.cpp | 4 +- .../vulkan/pipeline/vktPipelineStencilTests.cpp | 34 +- .../vulkan/pipeline/vktPipelineTimestampTests.cpp | 25 +- .../pipeline/vktPipelineVertexInputTests.cpp | 34 +- .../query_pool/vktQueryPoolOcclusionTests.cpp | 40 +- .../query_pool/vktQueryPoolOcclusionTests.hpp | 4 +- .../query_pool/vktQueryPoolStatisticsTests.cpp | 208 +-------- .../vulkan/rasterization/vktRasterizationTests.cpp | 36 +- .../vulkan/shaderexecutor/vktShaderExecutor.cpp | 157 +------ .../vulkan/shaderrender/vktShaderRender.cpp | 168 +------ .../vulkan/shaderrender/vktShaderRender.hpp | 2 +- .../sparse_resources/vktSparseResourcesBase.cpp | 5 +- .../vktSparseResourcesBufferMemoryAliasing.cpp | 4 +- .../vktSparseResourcesBufferSparseBinding.cpp | 4 +- .../vktSparseResourcesBufferSparseResidency.cpp | 4 +- .../vktSparseResourcesBufferTests.cpp | 12 +- .../vktSparseResourcesImageMemoryAliasing.cpp | 6 +- .../vktSparseResourcesImageSparseBinding.cpp | 4 +- .../vktSparseResourcesImageSparseResidency.cpp | 4 +- .../vktSparseResourcesMipmapSparseResidency.cpp | 4 +- .../vktSparseResourcesQueueBindSparseTests.cpp | 8 +- .../vktSparseResourcesShaderIntrinsicsBase.cpp | 4 +- .../vktSparseResourcesTestsUtil.cpp | 36 -- .../vktSparseResourcesTestsUtil.hpp | 11 - .../spirv_assembly/vktSpvAsmComputeShaderCase.cpp | 29 +- .../spirv_assembly/vktSpvAsmInstructionTests.cpp | 27 +- .../modules/vulkan/ssbo/vktSSBOLayoutCase.cpp | 28 +- .../vktSynchronizationBasicEventTests.cpp | 78 +--- .../vktSynchronizationBasicFenceTests.cpp | 4 +- .../vktSynchronizationBasicSemaphoreTests.cpp | 40 +- ...onizationInternallySynchronizedObjectsTests.cpp | 4 +- .../vktSynchronizationOperationMultiQueueTests.cpp | 16 +- ...vktSynchronizationOperationSingleQueueTests.cpp | 18 +- .../vktSynchronizationSmokeTests.cpp | 48 +- .../synchronization/vktSynchronizationUtil.cpp | 31 +- .../synchronization/vktSynchronizationUtil.hpp | 2 - .../vktTessellationCommonEdgeTests.cpp | 2 +- .../vktTessellationCoordinatesTests.cpp | 10 +- .../vktTessellationFractionalSpacingTests.cpp | 2 +- .../vktTessellationGeometryGridRenderTests.cpp | 2 +- .../vktTessellationGeometryPassthroughTests.cpp | 12 +- .../vktTessellationGeometryPointSizeTests.cpp | 2 +- .../vktTessellationInvarianceTests.cpp | 6 +- .../tessellation/vktTessellationMiscDrawTests.cpp | 12 +- .../vktTessellationPrimitiveDiscardTests.cpp | 14 +- .../vktTessellationShaderInputOutputTests.cpp | 2 +- .../tessellation/vktTessellationUserDefinedIO.cpp | 10 +- .../vulkan/tessellation/vktTessellationUtil.cpp | 20 +- .../vulkan/tessellation/vktTessellationUtil.hpp | 1 - .../tessellation/vktTessellationWindingTests.cpp | 2 +- .../vktTextureFilteringExplicitLodTests.cpp | 21 +- .../modules/vulkan/texture/vktTextureTestUtil.cpp | 47 +- .../modules/vulkan/ubo/vktUniformBlockCase.cpp | 31 +- .../modules/vulkan/vktRenderPassTests.cpp | 44 -- .../vulkancts/modules/vulkan/vktShaderLibrary.cpp | 28 +- external/vulkancts/modules/vulkan/vktTestCase.cpp | 4 +- .../modules/vulkan/wsi/vktWsiSwapchainTests.cpp | 58 +-- 116 files changed, 532 insertions(+), 2666 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkQueryUtil.cpp b/external/vulkancts/framework/vulkan/vkQueryUtil.cpp index da2f9c6..5619432 100644 --- a/external/vulkancts/framework/vulkan/vkQueryUtil.cpp +++ b/external/vulkancts/framework/vulkan/vkQueryUtil.cpp @@ -291,4 +291,13 @@ bool isLayerSupported (const std::vector& layers, const Requi return isLayerSupported(layers.begin(), layers.end(), required); } +VkQueue getDeviceQueue (const DeviceInterface& vkd, VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex) +{ + VkQueue queue; + + vkd.getDeviceQueue(device, queueFamilyIndex, queueIndex, &queue); + + return queue; +} + } // vk diff --git a/external/vulkancts/framework/vulkan/vkQueryUtil.hpp b/external/vulkancts/framework/vulkan/vkQueryUtil.hpp index 12b0834..bf1709b 100644 --- a/external/vulkancts/framework/vulkan/vkQueryUtil.hpp +++ b/external/vulkancts/framework/vulkan/vkQueryUtil.hpp @@ -52,6 +52,8 @@ std::vector enumerateInstanceExtensionProperties (co std::vector enumerateDeviceLayerProperties (const InstanceInterface& vki, VkPhysicalDevice physicalDevice); std::vector enumerateDeviceExtensionProperties (const InstanceInterface& vki, VkPhysicalDevice physicalDevice, const char* layerName); +VkQueue getDeviceQueue (const DeviceInterface& vkd, VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex); + // Feature / extension support bool isShaderStageSupported (const VkPhysicalDeviceFeatures& deviceFeatures, VkShaderStageFlagBits stage); diff --git a/external/vulkancts/framework/vulkan/vkRefUtil.cpp b/external/vulkancts/framework/vulkan/vkRefUtil.cpp index c987fe3..4b2ef87 100644 --- a/external/vulkancts/framework/vulkan/vkRefUtil.cpp +++ b/external/vulkancts/framework/vulkan/vkRefUtil.cpp @@ -66,4 +66,88 @@ Move allocateDescriptorSet (const DeviceInterface& vk, VkDevice return Move(check(object), Deleter(vk, device, pAllocateInfo->descriptorPool)); } +Move createSemaphore (const DeviceInterface& vk, + VkDevice device, + VkSemaphoreCreateFlags flags, + const VkAllocationCallbacks* pAllocator) +{ + const VkSemaphoreCreateInfo createInfo = + { + VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, + DE_NULL, + + flags + }; + + return createSemaphore(vk, device, &createInfo, pAllocator); +} + +Move createFence (const DeviceInterface& vk, + VkDevice device, + VkFenceCreateFlags flags, + const VkAllocationCallbacks* pAllocator) +{ + const VkFenceCreateInfo createInfo = + { + VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, + DE_NULL, + + flags + }; + + return createFence(vk, device, &createInfo, pAllocator); +} + +Move createCommandPool (const DeviceInterface& vk, + VkDevice device, + VkCommandPoolCreateFlags flags, + deUint32 queueFamilyIndex, + const VkAllocationCallbacks* pAllocator) +{ + const VkCommandPoolCreateInfo createInfo = + { + VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, + DE_NULL, + + flags, + queueFamilyIndex + }; + + return createCommandPool(vk, device, &createInfo, pAllocator); +} + +Move allocateCommandBuffer (const DeviceInterface& vk, + VkDevice device, + VkCommandPool commandPool, + VkCommandBufferLevel level) +{ + const VkCommandBufferAllocateInfo allocInfo = + { + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, + DE_NULL, + + commandPool, + level, + 1 + }; + + return allocateCommandBuffer(vk, device, &allocInfo); +} + +Move createEvent (const DeviceInterface& vk, + VkDevice device, + VkEventCreateFlags flags, + const VkAllocationCallbacks* pAllocateInfo) +{ + const VkEventCreateInfo createInfo = + { + VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, + DE_NULL, + + flags + }; + + return createEvent(vk, device, &createInfo, pAllocateInfo); +} + } // vk diff --git a/external/vulkancts/framework/vulkan/vkRefUtil.hpp b/external/vulkancts/framework/vulkan/vkRefUtil.hpp index 096790a..7484582 100644 --- a/external/vulkancts/framework/vulkan/vkRefUtil.hpp +++ b/external/vulkancts/framework/vulkan/vkRefUtil.hpp @@ -44,6 +44,32 @@ Move createComputePipeline (const DeviceInterface& vk, Move allocateCommandBuffer (const DeviceInterface& vk, VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo); Move allocateDescriptorSet (const DeviceInterface& vk, VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo); +Move createSemaphore (const DeviceInterface& vk, + VkDevice device, + VkSemaphoreCreateFlags flags = (VkSemaphoreCreateFlags)0, + const VkAllocationCallbacks* pAllocator = DE_NULL); + +Move createFence (const DeviceInterface& vk, + VkDevice device, + VkFenceCreateFlags flags = (VkFenceCreateFlags)0, + const VkAllocationCallbacks* pAllocator = DE_NULL); + +Move createCommandPool (const DeviceInterface& vk, + VkDevice device, + VkCommandPoolCreateFlags flags, + deUint32 queueFamilyIndex, + const VkAllocationCallbacks* pAllocator = DE_NULL); + +Move allocateCommandBuffer (const DeviceInterface& vk, + VkDevice device, + VkCommandPool commandPool, + VkCommandBufferLevel level); + +Move createEvent (const DeviceInterface& vk, + VkDevice device, + VkEventCreateFlags flags = (VkEventCreateFlags)0u, + const VkAllocationCallbacks* pAllocateInfo = DE_NULL); + } // vk #endif // _VKREFUTIL_HPP diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp index c34b9fd..677660d 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp @@ -307,9 +307,7 @@ tcu::TestStatus BufferTestInstance::bufferCreateAndAllocTest (VkDeviceSize size) // Bind the memory if ((m_testCase.flags & (VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT)) != 0) { - VkQueue queue = DE_NULL; - - vk.getDeviceQueue(vkDevice, queueFamilyIndex, 0, &queue); + const VkQueue queue = getDeviceQueue(vk, vkDevice, queueFamilyIndex, 0); const VkSparseMemoryBind sparseMemoryBind = { @@ -343,14 +341,7 @@ tcu::TestStatus BufferTestInstance::bufferCreateAndAllocTest (VkDeviceSize size) DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - const vk::Unique fence(vk::createFence(vk, vkDevice, &fenceParams)); + const vk::Unique fence(vk::createFence(vk, vkDevice)); if (vk.queueBindSparse(queue, 1, &bindSparseInfo, *fence) != VK_SUCCESS) return tcu::TestStatus::fail("Bind sparse buffer memory failed! (requested memory size: " + de::toString(size) + ")"); diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp index cbc26d3..d6a53f2 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp @@ -618,29 +618,10 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, BufferViewCase } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 count; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -670,7 +651,7 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, BufferViewCase attachmentClearValues // const VkClearValue* pClearValues; }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -761,16 +742,7 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, BufferViewCase } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } tcu::TestStatus BufferViewTestInstance::checkResult (deInt8 factor) diff --git a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp index 8440c90..52ee3b2 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp @@ -88,15 +88,7 @@ CommandBufferBareTestEnvironment::CommandBufferBareTestEnvironment(C , m_queueFamilyIndex (context.getUniversalQueueFamilyIndex()) , m_allocator (context.getDefaultAllocator()) { - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPoolCreateFlags, // VkCommandPoolCreateFlags flags; - m_queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_commandPool = createCommandPool(m_vkd, m_device, &cmdPoolCreateInfo, DE_NULL); + m_commandPool = createCommandPool(m_vkd, m_device, commandPoolCreateFlags, m_queueFamilyIndex); const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = { @@ -375,17 +367,7 @@ void CommandBufferRenderPassTestEnvironment::beginSecondaryCommandBuffer(VkComma void CommandBufferRenderPassTestEnvironment::submitPrimaryCommandBuffer(void) { - - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - const Unique fence (createFence(m_vkd, m_device, &fenceCreateInfo)); - - + const Unique fence (createFence(m_vkd, m_device)); const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; @@ -503,15 +485,7 @@ tcu::TestStatus createPoolNullParamsTest(Context& context) const DeviceInterface& vk = context.getDeviceInterface(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - queueFamilyIndex, // queueFamilyIndex; - }; - - createCommandPool(vk, vkDevice, &cmdPoolParams, DE_NULL); + createCommandPool(vk, vkDevice, 0u, queueFamilyIndex); return tcu::TestStatus::pass("Command Pool allocated correctly."); } @@ -622,13 +596,7 @@ bool executeCommandBuffer (const VkDevice device, const VkCommandBuffer commandBuffer, const bool exitBeforeEndCommandBuffer = false) { - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkEventCreateFlags flags; - }; - const Unique event (createEvent(vk, device, &eventCreateInfo)); + const Unique event (createEvent(vk, device)); const VkCommandBufferBeginInfo commandBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, //VkStructureType sType; @@ -647,13 +615,7 @@ bool executeCommandBuffer (const VkDevice device, VK_CHECK(vk.endCommandBuffer(commandBuffer)); { - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceCreateInfo)); + const Unique fence (createFence(vk, device)); const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // sType @@ -910,16 +872,8 @@ tcu::TestStatus executePrimaryBufferTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -935,15 +889,8 @@ tcu::TestStatus executePrimaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1007,17 +954,9 @@ tcu::TestStatus executeLargePrimaryBufferTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - std::vector events; for (deUint32 ndx = 0; ndx < LARGE_BUFFER_SIZE; ++ndx) - events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice, &eventCreateInfo, DE_NULL)))); + events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice)))); // record primary command buffer VK_CHECK(vk.beginCommandBuffer(*primCmdBuf, &primCmdBufBeginInfo)); @@ -1030,15 +969,8 @@ tcu::TestStatus executeLargePrimaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1113,13 +1045,7 @@ tcu::TestStatus resetBufferImplicitlyTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - }; - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // Put the command buffer in recording state. VK_CHECK(vk.beginCommandBuffer(*cmdBuf, &cmdBufBeginInfo)); @@ -1130,13 +1056,7 @@ tcu::TestStatus resetBufferImplicitlyTest(Context& context) VK_CHECK(vk.endCommandBuffer(*cmdBuf)); // We'll use a fence to wait for the execution of the queue - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags - }; - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1197,19 +1117,12 @@ inline SharedPtr > makeSharedPtr (Move move) bool submitAndCheck (Context& context, std::vector& cmdBuffers, std::vector & events) { - const VkDevice vkDevice = context.getDevice(); - const DeviceInterface& vk = context.getDeviceInterface(); - const VkQueue queue = context.getUniversalQueue(); + const VkDevice vkDevice = context.getDevice(); + const DeviceInterface& vk = context.getDeviceInterface(); + const VkQueue queue = context.getUniversalQueue(); + const Unique fence (createFence(vk, vkDevice)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags - }; - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); - - const VkSubmitInfo submitInfo = + const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // sType DE_NULL, // pNext @@ -1331,16 +1244,9 @@ tcu::TestStatus trimCommandPoolTest (Context& context, const VkCommandBufferLeve }; const Unique cmdPool (createCommandPool(vk, vkDevice, &cmdPoolParams)); - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - }; - std::vector events; for (deUint32 ndx = 0u; ndx < cmdBufferCount; ++ndx) - events.push_back(makeSharedPtr(createEvent(vk, vkDevice, &eventCreateInfo))); + events.push_back(makeSharedPtr(createEvent(vk, vkDevice))); { std::vector cmdBuffers(cmdBufferCount); @@ -1435,16 +1341,8 @@ tcu::TestStatus recordSinglePrimaryBufferTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // record primary command buffer VK_CHECK(vk.beginCommandBuffer(*primCmdBuf, &primCmdBufBeginInfo)); @@ -1492,16 +1390,8 @@ tcu::TestStatus recordLargePrimaryBufferTest(Context &context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -1527,15 +1417,8 @@ tcu::TestStatus recordLargePrimaryBufferTest(Context &context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1604,16 +1487,8 @@ tcu::TestStatus recordSingleSecondaryBufferTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // record primary command buffer VK_CHECK(vk.beginCommandBuffer(*secCmdBuf, &secCmdBufBeginInfo)); @@ -1661,16 +1536,8 @@ tcu::TestStatus recordLargeSecondaryBufferTest(Context &context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -1697,15 +1564,8 @@ tcu::TestStatus recordLargeSecondaryBufferTest(Context &context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1764,16 +1624,8 @@ tcu::TestStatus submitPrimaryBufferTwiceTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -1789,15 +1641,8 @@ tcu::TestStatus submitPrimaryBufferTwiceTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -1908,16 +1753,8 @@ tcu::TestStatus submitSecondaryBufferTwiceTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -1943,15 +1780,8 @@ tcu::TestStatus submitSecondaryBufferTwiceTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf1)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo1 = { @@ -2053,16 +1883,8 @@ tcu::TestStatus oneTimeSubmitFlagPrimaryBufferTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -2078,15 +1900,8 @@ tcu::TestStatus oneTimeSubmitFlagPrimaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -2209,16 +2024,8 @@ tcu::TestStatus oneTimeSubmitFlagSecondaryBufferTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -2244,15 +2051,8 @@ tcu::TestStatus oneTimeSubmitFlagSecondaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf1)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo1 = { @@ -2420,17 +2220,9 @@ tcu::TestStatus simultaneousUsePrimaryBufferTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique eventOne (createEvent(vk, vkDevice, &eventCreateInfo)); - const Unique eventTwo (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique eventOne (createEvent(vk, vkDevice)); + const Unique eventTwo (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *eventOne)); @@ -2446,16 +2238,9 @@ tcu::TestStatus simultaneousUsePrimaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence1 (createFence(vk, vkDevice, &fenceCreateInfo)); - const Unique fence2 (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence1 (createFence(vk, vkDevice)); + const Unique fence2 (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = @@ -2565,17 +2350,9 @@ tcu::TestStatus simultaneousUseSecondaryBufferTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique eventOne (createEvent(vk, vkDevice, &eventCreateInfo)); - const Unique eventTwo (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique eventOne (createEvent(vk, vkDevice)); + const Unique eventTwo (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *eventOne)); @@ -2604,15 +2381,8 @@ tcu::TestStatus simultaneousUseSecondaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -2786,15 +2556,8 @@ tcu::TestStatus simultaneousUseSecondaryBufferOnePrimaryBufferTest(Context& cont } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence(createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence(createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -2971,15 +2734,8 @@ tcu::TestStatus simultaneousUseSecondaryBufferTwoPrimaryBuffersTest(Context& con } VK_CHECK(vk.endCommandBuffer(*primCmdBufTwo)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence(createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence(createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -3335,17 +3091,10 @@ tcu::TestStatus submitBufferCountNonZero(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - }; - std::vector events; for (deUint32 ndx = 0; ndx < BUFFER_COUNT; ++ndx) { - events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice, &eventCreateInfo, DE_NULL)))); + events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice)))); } // Record the command buffers @@ -3359,13 +3108,7 @@ tcu::TestStatus submitBufferCountNonZero(Context& context) } // We'll use a fence to wait for the execution of the queue - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags - }; - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { @@ -3441,16 +3184,9 @@ tcu::TestStatus submitBufferCountEqualZero(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - }; - std::vector events; for (deUint32 ndx = 0; ndx < BUFFER_COUNT; ++ndx) - events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice, &eventCreateInfo, DE_NULL)))); + events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice)))); // Record the command buffers for (deUint32 ndx = 0; ndx < BUFFER_COUNT; ++ndx) @@ -3463,14 +3199,8 @@ tcu::TestStatus submitBufferCountEqualZero(Context& context) } // We'll use a fence to wait for the execution of the queue - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags - }; - const Unique fenceZero (createFence(vk, vkDevice, &fenceCreateInfo)); - const Unique fenceOne (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fenceZero (createFence(vk, vkDevice)); + const Unique fenceOne (createFence(vk, vkDevice)); const VkSubmitInfo submitInfoCountZero = { @@ -3562,17 +3292,9 @@ tcu::TestStatus submitBufferWaitSingleSemaphore(Context& context) DE_NULL // const VkCommandBufferInheritanceInfo* pInheritanceInfo; }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create two events that will be used to check if command buffers has been executed - const Unique event1 (createEvent(vk, vkDevice, &eventCreateInfo)); - const Unique event2 (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event1 (createEvent(vk, vkDevice)); + const Unique event2 (createEvent(vk, vkDevice)); // reset events VK_CHECK(vk.resetEvent(vkDevice, *event1)); @@ -3600,25 +3322,11 @@ tcu::TestStatus submitBufferWaitSingleSemaphore(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf2)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); // create semaphore for use in this test - const VkSemaphoreCreateInfo semaphoreCreateInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0, // flags; - }; - - const Unique semaphore (createSemaphore(vk, vkDevice, &semaphoreCreateInfo)); + const Unique semaphore (createSemaphore(vk, vkDevice)); // create submit info for first buffer - signalling semaphore const VkSubmitInfo submitInfo1 = @@ -3721,16 +3429,8 @@ tcu::TestStatus submitBufferWaitManySemaphores(Context& context) DE_NULL // const VkCommandBufferInheritanceInfo* pInheritanceInfo; }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if command buffers has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event - at creation state is undefined VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -3746,32 +3446,17 @@ tcu::TestStatus submitBufferWaitManySemaphores(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); // numSemaphores is declared const, so this array can be static // the semaphores will be destroyed automatically at end of scope Move semaphoreArray[numSemaphores]; VkSemaphore semaphores[numSemaphores]; - // prepare create info for semaphores - same for all - const VkSemaphoreCreateInfo semaphoreCreateInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0, // flags; - }; - for (deUint32 idx = 0; idx < numSemaphores; ++idx) { // create semaphores for use in this test - semaphoreArray[idx] = createSemaphore(vk, vkDevice, &semaphoreCreateInfo); + semaphoreArray[idx] = createSemaphore(vk, vkDevice); semaphores[idx] = semaphoreArray[idx].get(); }; @@ -3888,16 +3573,9 @@ tcu::TestStatus submitBufferNullFence(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags; - }; - std::vector events; for (deUint32 ndx = 0; ndx < BUFFER_COUNT; ++ndx) - events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice, &eventCreateInfo, DE_NULL)))); + events.push_back(VkEventSp(new vk::Unique(createEvent(vk, vkDevice)))); // Record the command buffers for (deUint32 ndx = 0; ndx < BUFFER_COUNT; ++ndx) @@ -3910,13 +3588,7 @@ tcu::TestStatus submitBufferNullFence(Context& context) } // We'll use a fence to wait for the execution of the queue - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType; - DE_NULL, // pNext; - 0u, // flags - }; - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfoNullFence = { @@ -4036,16 +3708,8 @@ tcu::TestStatus executeSecondaryBufferTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique event (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique event (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *event)); @@ -4069,15 +3733,8 @@ tcu::TestStatus executeSecondaryBufferTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBuf)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fence (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // sType @@ -4173,16 +3830,8 @@ tcu::TestStatus executeSecondaryBufferTwiceTest(Context& context) &secCmdBufInheritInfo, }; - // Fill create info struct for event - const VkEventCreateInfo eventCreateInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0u, - }; - // create event that will be used to check if secondary command buffer has been executed - const Unique eventOne (createEvent(vk, vkDevice, &eventCreateInfo)); + const Unique eventOne (createEvent(vk, vkDevice)); // reset event VK_CHECK(vk.resetEvent(vkDevice, *eventOne)); @@ -4218,16 +3867,9 @@ tcu::TestStatus executeSecondaryBufferTwiceTest(Context& context) } VK_CHECK(vk.endCommandBuffer(*primCmdBufTwo)); - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - // create fence to wait for execution of queue - const Unique fenceOne (createFence(vk, vkDevice, &fenceCreateInfo)); - const Unique fenceTwo (createFence(vk, vkDevice, &fenceCreateInfo)); + const Unique fenceOne (createFence(vk, vkDevice)); + const Unique fenceTwo (createFence(vk, vkDevice)); const VkSubmitInfo submitInfoOne = { @@ -4438,14 +4080,6 @@ tcu::TestStatus orderBindPipelineTest(Context& context) queueFamilyIndex, // queueFamilyIndex }; const Unique cmdPool (createCommandPool(vk, device, &cmdPoolCreateInfo)); - - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - const VkCommandBufferAllocateInfo cmdBufCreateInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType @@ -4463,7 +4097,7 @@ tcu::TestStatus orderBindPipelineTest(Context& context) (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const Unique cmdCompleteFence (createFence(vk, device, &fenceCreateInfo)); + const Unique cmdCompleteFence (createFence(vk, device)); const Unique cmd (allocateCommandBuffer(vk, device, &cmdBufCreateInfo)); VK_CHECK(vk.beginCommandBuffer(*cmd, &cmdBufBeginInfo)); diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp index 3d4a861..7ac6e44 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp @@ -231,43 +231,13 @@ CopiesAndBlittingTestInstance::CopiesAndBlittingTestInstance (Context& context, const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); // Create command pool - { - 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; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); // Create command buffer - { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } void CopiesAndBlittingTestInstance::generateBuffer (tcu::PixelBufferAccess buffer, int width, int height, int depth, FillMode mode) diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp index c253ece..409849a 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp @@ -387,9 +387,8 @@ tcu::TestStatus createDeviceTest (Context& context) const Unique device (createDevice(instanceDriver, physicalDevice, &deviceCreateInfo)); const DeviceDriver deviceDriver (instanceDriver, device.get()); - VkQueue queue; + const VkQueue queue = getDeviceQueue(deviceDriver, *device, queueFamilyIndex, queueIndex); - deviceDriver.getDeviceQueue(device.get(), queueFamilyIndex, queueIndex, &queue); VK_CHECK(deviceDriver.queueWaitIdle(queue)); return tcu::TestStatus::pass("Pass"); @@ -445,11 +444,9 @@ tcu::TestStatus createMultipleDevicesTest (Context& context) } { - const DeviceDriver deviceDriver(instanceDriver, devices[deviceNdx]); - VkQueue queue; + const DeviceDriver deviceDriver (instanceDriver, devices[deviceNdx]); + const VkQueue queue = getDeviceQueue(deviceDriver, devices[deviceNdx], queueFamilyIndex, queueIndex); - DE_ASSERT(queueIndex < queueCount); - deviceDriver.getDeviceQueue(devices[deviceNdx], queueFamilyIndex, queueIndex, &queue); VK_CHECK(deviceDriver.queueWaitIdle(queue)); } } @@ -498,7 +495,7 @@ tcu::TestStatus createDeviceWithUnsupportedExtensionsTest (Context& context) VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, DE_NULL, (VkDeviceQueueCreateFlags)0u, - 0, //queueFamiliIndex; + 0, //queueFamilyIndex; 1, //queueCount; &queuePriority, //pQueuePriorities; }; @@ -609,10 +606,9 @@ tcu::TestStatus createDeviceWithVariousQueueCountsTest (Context& context) for (deUint32 queueIndex = 0; queueIndex < queueCount; queueIndex++) { - VkQueue queue; - VkResult result; + const VkQueue queue = getDeviceQueue(deviceDriver, *device, queueFamilyIndex, queueIndex); + VkResult result; - deviceDriver.getDeviceQueue(device.get(), queueFamilyIndex, queueIndex, &queue); TCU_CHECK(!!queue); result = deviceDriver.queueWaitIdle(queue); @@ -688,9 +684,8 @@ tcu::TestStatus createDeviceFeatures2Test (Context& context) { const Unique device (createDevice(vki, physicalDevice, &deviceCreateInfo)); const DeviceDriver vkd (vki, device.get()); - VkQueue queue; + const VkQueue queue = getDeviceQueue(vkd, *device, queueFamilyIndex, queueIndex); - vkd.getDeviceQueue(device.get(), queueFamilyIndex, queueIndex, &queue); VK_CHECK(vkd.queueWaitIdle(queue)); } diff --git a/external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp index 9cf7d23..6735269 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp @@ -98,43 +98,13 @@ FillBufferTestInstance::FillBufferTestInstance (Context& context, TestParams tes Allocator& memAlloc = context.getDefaultAllocator(); // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer - { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); // Create desctination buffer { diff --git a/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp b/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp index ba1e46f..a86b0f9 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp @@ -646,14 +646,7 @@ tcu::TestStatus MemoryCommitmentAllocateOnlyTestInstance::iterate(void) void MemoryCommitmentTestInstance::submitCommandsAndWait (const DeviceInterface& vkd, const VkDevice device, const VkQueue queue, const VkCommandBuffer& cmdBuffer) { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - Move fence = createFence(vkd, device, &fenceParams); + Move fence = createFence(vkd, device); const VkSubmitInfo submitInfo = { @@ -706,34 +699,19 @@ void MemoryCommitmentTestCase::initPrograms (SourceCollections& programCollectio Move MemoryCommitmentTestInstance::createCommandPool() const { - const VkDevice device = m_context.getDevice(); - const DeviceInterface& vkd = m_context.getDeviceInterface(); - const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; + const VkDevice device = m_context.getDevice(); + const DeviceInterface& vkd = m_context.getDeviceInterface(); + const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - return vk::createCommandPool(vkd, device, &cmdPoolCreateInfo, DE_NULL); + return vk::createCommandPool(vkd, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); } Move MemoryCommitmentTestInstance::allocatePrimaryCommandBuffer (VkCommandPool commandPool) const { const VkDevice device = m_context.getDevice(); const DeviceInterface& vkd = m_context.getDeviceInterface(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1 // deUint32 commandBufferCount; - }; - return vk::allocateCommandBuffer(vkd, device, &cmdBufferAllocateInfo); + return vk::allocateCommandBuffer(vkd, device, commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } bool MemoryCommitmentTestInstance::isDeviceMemoryCommitmentOk(const VkMemoryRequirements memoryRequirements) diff --git a/external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp index 9e5582e..4312dd4 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp @@ -296,30 +296,10 @@ void GranularityInstance::initRenderPass (void) m_frameBuffer = createFramebuffer(vk, device, &framebufferParams); } - { // Create CommandPool - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; + m_cmdPool = createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); - m_cmdPool = createCommandPool(vk, device, &cmdPoolParams); - } - - { // Create CommandBuffer - const VkCommandBufferAllocateInfo bufferAllocInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 count; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, device, &bufferAllocInfo); - } + // Create CommandBuffer + m_cmdBuffer = allocateCommandBuffer(vk, device, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); { // Begin CommandBuffer const VkCommandBufferBeginInfo cmdBufferBeginInfo = diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp index e63bc72..e0219c0 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp @@ -513,29 +513,12 @@ de::MovePtr ImageClearingTestInstance::allocateAndBindImageMemory (V Move ImageClearingTestInstance::createCommandPool (VkCommandPoolCreateFlags commandPoolCreateFlags) const { - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPoolCreateFlags, // VkCommandPoolCreateFlags flags; - m_queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - return vk::createCommandPool(m_vkd, m_device, &cmdPoolCreateInfo, DE_NULL); + return vk::createCommandPool(m_vkd, m_device, commandPoolCreateFlags, m_queueFamilyIndex); } Move ImageClearingTestInstance::allocatePrimaryCommandBuffer (VkCommandPool commandPool) const { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1 // deUint32 commandBufferCount; - }; - - return vk::allocateCommandBuffer(m_vkd, m_device, &cmdBufferAllocateInfo); + return vk::allocateCommandBuffer(m_vkd, m_device, commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } Move ImageClearingTestInstance::createImage (VkImageType imageType, VkFormat format, VkExtent3D extent, VkImageUsageFlags usage) const @@ -713,14 +696,7 @@ void ImageClearingTestInstance::endCommandBuffer (void) const void ImageClearingTestInstance::submitCommandBuffer (void) const { - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - const Unique fence (createFence(m_vkd, m_device, &fenceCreateInfo)); + const Unique fence (createFence(m_vkd, m_device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp index f225411..303a1b2 100644 --- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp +++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp @@ -522,14 +522,7 @@ vk::Move SingleTargetRenderInstance::createCommandPool (const vk::VkDevice device, deUint32 queueFamilyIndex) { - const vk::VkCommandPoolCreateInfo createInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, - DE_NULL, - vk::VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // flags - queueFamilyIndex, // queueFamilyIndex - }; - return vk::createCommandPool(vki, device, &createInfo); + return vk::createCommandPool(vki, device, vk::VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); } void SingleTargetRenderInstance::readRenderTarget (tcu::TextureLevel& dst) @@ -580,20 +573,6 @@ void SingleTargetRenderInstance::readRenderTarget (tcu::TextureLevel& dst) 0u, // offset (vk::VkDeviceSize)pixelDataSize // size }; - const vk::VkCommandBufferAllocateInfo cmdBufAllocInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *m_cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // bufferCount - }; - const vk::VkFenceCreateInfo fenceCreateInfo = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; const vk::VkCommandBufferBeginInfo cmdBufBeginInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, @@ -620,8 +599,8 @@ void SingleTargetRenderInstance::readRenderTarget (tcu::TextureLevel& dst) const de::MovePtr bufferMemory = allocateAndBindObjectMemory(m_vki, m_device, m_allocator, *buffer, vk::MemoryRequirement::HostVisible); - const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, &cmdBufAllocInfo)); - const vk::Unique cmdCompleteFence (vk::createFence(m_vki, m_device, &fenceCreateInfo)); + const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const vk::Unique cmdCompleteFence (vk::createFence(m_vki, m_device)); const deUint64 infiniteTimeout = ~(deUint64)0u; // copy content to buffer @@ -698,14 +677,6 @@ tcu::TestStatus SingleTargetRenderInstance::iterate (void) *m_colorAttachmentImage, // image fullSubrange, // subresourceRange }; - const vk::VkCommandBufferAllocateInfo cmdBufAllocInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *m_cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // count - }; const vk::VkCommandBufferBeginInfo cmdBufBeginInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, @@ -713,15 +684,9 @@ tcu::TestStatus SingleTargetRenderInstance::iterate (void) vk::VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // flags (const vk::VkCommandBufferInheritanceInfo*)DE_NULL, }; - const vk::VkFenceCreateInfo fenceCreateInfo = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - (vk::VkFenceCreateFlags)0, - }; - const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, &cmdBufAllocInfo)); - const vk::Unique fence (vk::createFence(m_vki, m_device, &fenceCreateInfo)); + const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const vk::Unique fence (vk::createFence(m_vki, m_device)); const deUint64 infiniteTimeout = ~(deUint64)0u; VK_CHECK(m_vki.beginCommandBuffer(*cmd, &cmdBufBeginInfo)); @@ -1025,14 +990,6 @@ void SingleCmdRenderInstance::renderToTarget (void) { 0, 0 }, // offset { m_targetSize.x(), m_targetSize.y() }, // extent }; - const vk::VkCommandBufferAllocateInfo mainCmdBufCreateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *m_cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // count - }; const vk::VkCommandBufferBeginInfo mainCmdBufBeginInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, @@ -1040,14 +997,6 @@ void SingleCmdRenderInstance::renderToTarget (void) vk::VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // flags (const vk::VkCommandBufferInheritanceInfo*)DE_NULL, }; - const vk::VkCommandBufferAllocateInfo passCmdBufCreateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *m_cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_SECONDARY, // level - 1u, // count - }; const vk::VkCommandBufferInheritanceInfo passCmdBufInheritInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, @@ -1067,12 +1016,6 @@ void SingleCmdRenderInstance::renderToTarget (void) vk::VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, // flags &passCmdBufInheritInfo, }; - const vk::VkFenceCreateInfo fenceCreateInfo = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; const vk::VkClearValue clearValue = vk::makeClearValueColorF32(0.0f, 0.0f, 0.0f, 0.0f); const vk::VkRenderPassBeginInfo renderPassBeginInfo = { @@ -1087,9 +1030,9 @@ void SingleCmdRenderInstance::renderToTarget (void) const vk::VkPipelineLayout pipelineLayout (getPipelineLayout()); const vk::Unique pipeline (createPipeline(pipelineLayout)); - const vk::Unique mainCmd (vk::allocateCommandBuffer(m_vki, m_device, &mainCmdBufCreateInfo)); - const vk::Unique passCmd ((m_isPrimaryCmdBuf) ? (vk::Move()) : (vk::allocateCommandBuffer(m_vki, m_device, &passCmdBufCreateInfo))); - const vk::Unique fence (vk::createFence(m_vki, m_device, &fenceCreateInfo)); + const vk::Unique mainCmd (vk::allocateCommandBuffer(m_vki, m_device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const vk::Unique passCmd ((m_isPrimaryCmdBuf) ? (vk::Move()) : (vk::allocateCommandBuffer(m_vki, m_device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_SECONDARY))); + const vk::Unique fence (vk::createFence(m_vki, m_device)); const deUint64 infiniteTimeout = ~(deUint64)0u; const vk::VkSubpassContents passContents = (m_isPrimaryCmdBuf) ? (vk::VK_SUBPASS_CONTENTS_INLINE) : (vk::VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS); @@ -1787,22 +1730,6 @@ void ComputeCommand::submitAndWait (deUint32 queueFamilyIndex, vk::VkQueue queue queueFamilyIndex, // queueFamilyIndex }; const vk::Unique cmdPool (vk::createCommandPool(m_vki, m_device, &cmdPoolCreateInfo)); - - const vk::VkFenceCreateInfo fenceCreateInfo = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; - - const vk::VkCommandBufferAllocateInfo cmdBufCreateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // count - }; const vk::VkCommandBufferBeginInfo cmdBufBeginInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, @@ -1811,8 +1738,8 @@ void ComputeCommand::submitAndWait (deUint32 queueFamilyIndex, vk::VkQueue queue (const vk::VkCommandBufferInheritanceInfo*)DE_NULL, }; - const vk::Unique cmdCompleteFence (vk::createFence(m_vki, m_device, &fenceCreateInfo)); - const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, &cmdBufCreateInfo)); + const vk::Unique cmdCompleteFence (vk::createFence(m_vki, m_device)); + const vk::Unique cmd (vk::allocateCommandBuffer(m_vki, m_device, *cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const deUint64 infiniteTimeout = ~(deUint64)0u; VK_CHECK(m_vki.beginCommandBuffer(*cmd, &cmdBufBeginInfo)); @@ -3075,12 +3002,6 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, }; const vk::Unique dataBuffer (vk::createBuffer(vki, device, &bufferCreateInfo)); const de::MovePtr dataBufferMemory = allocateAndBindObjectMemory(vki, device, allocator, *dataBuffer, vk::MemoryRequirement::HostVisible); - const vk::VkFenceCreateInfo fenceCreateInfo = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - 0u, // flags - }; const vk::VkBufferMemoryBarrier preMemoryBarrier = { vk::VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, @@ -3135,14 +3056,6 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, queueFamilyIndex, // queueFamilyIndex }; const vk::Unique cmdPool (vk::createCommandPool(vki, device, &cmdPoolCreateInfo)); - const vk::VkCommandBufferAllocateInfo cmdBufCreateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - *cmdPool, // cmdPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // count - }; const vk::VkCommandBufferBeginInfo cmdBufBeginInfo = { vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, @@ -3151,8 +3064,8 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, (const vk::VkCommandBufferInheritanceInfo*)DE_NULL, }; - const vk::Unique cmd (vk::allocateCommandBuffer(vki, device, &cmdBufCreateInfo)); - const vk::Unique cmdCompleteFence (vk::createFence(vki, device, &fenceCreateInfo)); + const vk::Unique cmd (vk::allocateCommandBuffer(vki, device, *cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const vk::Unique cmdCompleteFence (vk::createFence(vki, device)); const deUint64 infiniteTimeout = ~(deUint64)0u; std::vector copySlices; diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp index adf3239..417cc30 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp @@ -228,7 +228,7 @@ tcu::TestStatus SharedVarTestInstance::iterate (void) const VkBufferMemoryBarrier computeFinishBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *buffer, 0ull, bufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -399,7 +399,7 @@ tcu::TestStatus SharedVarAtomicOpTestInstance::iterate (void) const VkBufferMemoryBarrier computeFinishBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *buffer, 0ull, bufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -572,7 +572,7 @@ tcu::TestStatus SSBOLocalBarrierTestInstance::iterate (void) const VkBufferMemoryBarrier computeFinishBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *buffer, 0ull, bufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -783,7 +783,7 @@ tcu::TestStatus CopyImageToSSBOTestInstance::iterate (void) // Prepare the command buffer const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -993,7 +993,7 @@ tcu::TestStatus CopySSBOToImageTestInstance::iterate (void) // Prepare the command buffer const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -1262,7 +1262,7 @@ tcu::TestStatus BufferToBufferInvertTestInstance::iterate (void) const VkBufferMemoryBarrier shaderWriteBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *outputBuffer, 0ull, bufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -1453,7 +1453,7 @@ tcu::TestStatus InvertSSBOInPlaceTestInstance::iterate (void) const VkBufferMemoryBarrier shaderWriteBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *buffer, 0ull, bufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -1646,7 +1646,7 @@ tcu::TestStatus WriteToMultipleSSBOTestInstance::iterate (void) }; const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -1868,7 +1868,7 @@ tcu::TestStatus SSBOBarrierTestInstance::iterate (void) const VkBufferMemoryBarrier afterComputeBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *outputBuffer, 0ull, outputBufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -2084,7 +2084,7 @@ tcu::TestStatus ImageAtomicOpTestInstance::iterate (void) // Prepare the command buffer const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -2303,7 +2303,7 @@ tcu::TestStatus ImageBarrierTestInstance::iterate (void) const VkBufferMemoryBarrier afterComputeBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *outputBuffer, 0ull, outputBufferSizeBytes); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands @@ -2376,7 +2376,7 @@ tcu::TestStatus createTest (Context& context) const Unique pipeline(makeComputePipeline(vk, device, *pipelineLayout, *shaderModule)); const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp index 4819fd7..ebc67ca 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp @@ -265,7 +265,7 @@ tcu::TestStatus IndirectDispatchInstanceBufferUpload::iterate (void) // Create command buffer const vk::Unique cmdPool(makeCommandPool(m_device_interface, m_device, m_queueFamilyIndex)); - const vk::Unique cmdBuffer(makeCommandBuffer(m_device_interface, m_device, *cmdPool)); + const vk::Unique cmdBuffer(allocateCommandBuffer(m_device_interface, m_device, *cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Begin recording commands beginCommandBuffer(m_device_interface, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp index bc7c81a..b5b949b 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp @@ -440,7 +440,7 @@ tcu::TestStatus ComputeBuiltinVarInstance::iterate (void) VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *resultBuffer, 0ull, resultBufferSize); const Unique cmdPool(makeCommandPool(m_vki, m_device, m_queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(m_vki, m_device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(m_vki, m_device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands beginCommandBuffer(m_vki, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp index 0fb4b0d..5aa61a9 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp @@ -98,19 +98,6 @@ Move makeCommandPool (const DeviceInterface& vk, const VkDevice d return createCommandPool(vk, device, &commandPoolParams); } -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo bufferAllocateParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - return allocateCommandBuffer(vk, device, &bufferAllocateParams); -} - Move makePipelineLayout (const DeviceInterface& vk, const VkDevice device) { @@ -295,13 +282,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceParams)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp index a34c7fe..4078c66 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp @@ -82,10 +82,6 @@ vk::Move makeCommandPool (const vk::DeviceInterface& v const vk::VkDevice device, const deUint32 queueFamilyIndex); -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, - const vk::VkDevice device, - const vk::VkCommandPool commandPool); - vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device); diff --git a/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp b/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp index db93794..0596ff5 100644 --- a/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp @@ -409,17 +409,8 @@ void DrawTestInstanceBase::initialize (const DrawParamsBase& data) VK_WHOLE_SIZE); const CmdPoolCreateInfo cmdPoolCreateInfo(queueFamilyIndex); - m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, &cmdBufferAllocateInfo); + m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); + m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); initPipeline(device); } diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp index 177c02f..e0a5381 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp @@ -141,17 +141,8 @@ void DrawTestsBaseClass::initialize (void) dataSize); const CmdPoolCreateInfo cmdPoolCreateInfo(queueFamilyIndex); - m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, &cmdBufferAllocateInfo); + m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); + m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); initPipeline(device); } diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp index cd0b0eb..ee25177 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp @@ -306,16 +306,7 @@ void Image::readUsingBuffer (vk::VkQueue queue, //todo [scygan] get proper queueFamilyIndex CmdPoolCreateInfo copyCmdPoolCreateInfo(0); vk::Unique copyCmdPool(vk::createCommandPool(m_vk, m_device, ©CmdPoolCreateInfo)); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *copyCmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, &cmdBufferAllocateInfo)); + vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, *copyCmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo; VK_CHECK(m_vk.beginCommandBuffer(*copyCmdBuffer, &beginInfo)); @@ -440,16 +431,7 @@ de::SharedPtr Image::copyToLinearImage (vk::VkQueue queue, //todo [scygan] get proper queueFamilyIndex CmdPoolCreateInfo copyCmdPoolCreateInfo(0); vk::Unique copyCmdPool(vk::createCommandPool(m_vk, m_device, ©CmdPoolCreateInfo)); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *copyCmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, &cmdBufferAllocateInfo)); + vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, *copyCmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo; VK_CHECK(m_vk.beginCommandBuffer(*copyCmdBuffer, &beginInfo)); @@ -591,17 +573,7 @@ void Image::upload (vk::VkQueue queue, //todo [scygan] get proper queueFamilyIndex CmdPoolCreateInfo copyCmdPoolCreateInfo(0); vk::Unique copyCmdPool(vk::createCommandPool(m_vk, m_device, ©CmdPoolCreateInfo)); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *copyCmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, &cmdBufferAllocateInfo)); + vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, *copyCmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo; VK_CHECK(m_vk.beginCommandBuffer(*copyCmdBuffer, &beginInfo)); @@ -713,16 +685,7 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, //todo [scygan] get proper queueFamilyIndex CmdPoolCreateInfo copyCmdPoolCreateInfo(0); vk::Unique copyCmdPool(vk::createCommandPool(m_vk, m_device, ©CmdPoolCreateInfo)); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *copyCmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, &cmdBufferAllocateInfo)); + vk::Unique copyCmdBuffer(vk::allocateCommandBuffer(m_vk, m_device, *copyCmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo; VK_CHECK(m_vk.beginCommandBuffer(*copyCmdBuffer, &beginInfo)); diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp index a1a28af..452d631 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp @@ -396,15 +396,7 @@ InstancedDrawInstance::InstancedDrawInstance(Context &context, TestParams params const CmdPoolCreateInfo cmdPoolCreateInfo(queueFamilyIndex); m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, &cmdBufferAllocateInfo); + m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); const vk::Unique vs(createShaderModule(m_vk, device, m_context.getBinaryCollection().get("InstancedDrawVert"), 0)); const vk::Unique fs(createShaderModule(m_vk, device, m_context.getBinaryCollection().get("InstancedDrawFrag"), 0)); diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp index 01f9c10..efd98db 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp @@ -246,18 +246,9 @@ tcu::ConstPixelBufferAccess NegativeViewportHeightTestInstance::draw (const VkVi // Command buffer - const CmdPoolCreateInfo cmdPoolCreateInfo (queueFamilyIndex); - const Unique cmdPool (createCommandPool(vk, device, &cmdPoolCreateInfo)); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique cmdBuffer(allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + const CmdPoolCreateInfo cmdPoolCreateInfo (queueFamilyIndex); + const Unique cmdPool (createCommandPool(vk, device, &cmdPoolCreateInfo)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Draw @@ -306,13 +297,7 @@ tcu::ConstPixelBufferAccess NegativeViewportHeightTestInstance::draw (const VkVi // Submit { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceInfo)); + const Unique fence (createFence(vk, device)); const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp index 48ae00b..7bd9f96 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp @@ -283,16 +283,7 @@ protected: const CmdPoolCreateInfo cmdPoolCreateInfo(m_context.getUniversalQueueFamilyIndex()); m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, &cmdBufferAllocateInfo); + m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); } virtual tcu::TestStatus iterate (void) diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp index ee3f48d..d97ca60 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp @@ -256,16 +256,7 @@ protected: const CmdPoolCreateInfo cmdPoolCreateInfo(m_context.getUniversalQueueFamilyIndex()); m_cmdPool = vk::createCommandPool(m_vk, device, &cmdPoolCreateInfo); - - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, &cmdBufferAllocateInfo); + m_cmdBuffer = vk::allocateCommandBuffer(m_vk, device, *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); } virtual tcu::TestStatus iterate (void) diff --git a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp index bff226d..f26209b 100644 --- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp +++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp @@ -685,8 +685,8 @@ tcu::TestStatus EarlyFragmentTestInstance::iterate (void) const Unique pipelineLayout(makePipelineLayout(vk, device, *descriptorSetLayout)); const Unique pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertexModule, *fragmentModule, renderSize, (m_testMode == MODE_DEPTH), (m_testMode == MODE_STENCIL))); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Draw commands diff --git a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp index 465b999..200e35b 100644 --- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp +++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp @@ -95,31 +95,6 @@ VkImageMemoryBarrier makeImageMemoryBarrier (const VkAccessFlags srcAccessMask return barrier; } -Move makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - return createCommandPool(vk, device, &info); -} - -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 commandBufferCount; - }; - return allocateCommandBuffer(vk, device, &info); -} - Move makeDescriptorSet (const DeviceInterface& vk, const VkDevice device, const VkDescriptorPool descriptorPool, @@ -236,13 +211,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceInfo)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.hpp b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.hpp index b06dbe1..f8b6cef 100644 --- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.hpp +++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.hpp @@ -36,8 +36,6 @@ namespace FragmentOperations { vk::VkBufferCreateInfo makeBufferCreateInfo (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage); -vk::Move makeCommandPool (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex); -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool); vk::Move makeDescriptorSet (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout); diff --git a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp index a4e9c44..8feb7af 100644 --- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp +++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp @@ -587,8 +587,8 @@ public: m_pipelineLayout = makePipelineLayout (vk, device); m_pipeline = makeGraphicsPipeline (vk, device, *m_pipelineLayout, *m_renderPass, *m_vertexModule, *m_geometryModule, *m_fragmentModule, m_renderSize, m_numViewports, scissors); - m_cmdPool = makeCommandPool (vk, device, queueFamilyIndex); - m_cmdBuffer = makeCommandBuffer (vk, device, *m_cmdPool); + m_cmdPool = createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); + m_cmdBuffer = allocateCommandBuffer (vk, device, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } void draw (Context& context, const VkBuffer colorBuffer) const diff --git a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp index a2c1fa1..2951b12 100644 --- a/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp +++ b/external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp @@ -563,8 +563,8 @@ public: m_framebuffer = makeFramebuffer (vk, device, *m_renderPass, 1u, &m_colorAttachment.get(), static_cast(m_renderSize.x()), static_cast(m_renderSize.y())); m_pipelineLayout = makePipelineLayout (vk, device); - m_cmdPool = makeCommandPool (vk, device, queueFamilyIndex); - m_cmdBuffer = makeCommandBuffer (vk, device, *m_cmdPool); + m_cmdPool = createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); + m_cmdBuffer = allocateCommandBuffer (vk, device, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp index 74da22a..d831112 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp @@ -85,8 +85,8 @@ tcu::TestStatus GeometryExpanderRenderTestInstance::iterate (void) const VkImageSubresourceRange colorSubRange = makeImageSubresourceRange(VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u); const Unique colorAttachmentView (makeImageView(vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorSubRange)); const Unique framebuffer (makeFramebuffer(vk, device, *renderPass, *colorAttachmentView, resolution.x(), resolution.y(), 1u)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const VkDeviceSize vertexDataSizeBytes = sizeInBytes(m_vertexPosData) + sizeInBytes(m_vertexAttrData); const deUint32 vertexPositionsOffset = 0u; diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp index 291ec43..403b376 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp @@ -124,14 +124,7 @@ void uploadImage (Context& context, // Create command pool and buffer { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - cmdPool = createCommandPool(vk, device, &cmdPoolParams); + cmdPool = createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = { @@ -145,16 +138,7 @@ void uploadImage (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, device, &fenceParams); - } + fence = createFence(vk, device); // Barriers for copying buffer to image const VkBufferMemoryBarrier preBufferBarrier = diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp index 278994f..4cd0c29 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp @@ -371,8 +371,8 @@ void draw (Context& context, const Unique pipelineLayout (makePipelineLayout (vk, device)); const Unique pipeline (makeGraphicsPipeline (vk, device, *pipelineLayout, *renderPass, *vertexModule, *geometryModule, *fragmentModule, renderExtent)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Initialize vertex data { diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp index 182f9c0..b6790c4 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp @@ -931,8 +931,8 @@ tcu::TestStatus test (Context& context, const TestParams params) const Unique pipelineLayout (makePipelineLayout (vk, device)); const Unique pipeline (makeGraphicsPipeline (vk, device, *pipelineLayout, *renderPass, *vertexModule, *geometryModule, *fragmentModule, makeExtent2D(params.image.size.width, params.image.size.height))); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); zeroBuffer(vk, device, *colorBufferAlloc, colorBufferSize); diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp index 0c8f63f..5c831dd 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp @@ -566,31 +566,6 @@ Move makeFramebuffer (const DeviceInterface& vk, return createFramebuffer(vk, device, &framebufferInfo); } -Move makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - return createCommandPool(vk, device, &info); -} - -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 commandBufferCount; - }; - return allocateCommandBuffer(vk, device, &info); -} - VkImageMemoryBarrier makeImageMemoryBarrier (const VkAccessFlags srcAccessMask, const VkAccessFlags dstAccessMask, const VkImageLayout oldLayout, @@ -685,13 +660,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceInfo)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.hpp b/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.hpp index 43e72a5..179cd50 100644 --- a/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.hpp @@ -173,8 +173,6 @@ vk::Move makeImageView (const vk::DeviceInterface& vk, cons vk::VkBufferImageCopy makeBufferImageCopy (const vk::VkExtent3D extent, const vk::VkImageSubresourceLayers subresourceLayers); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout = DE_NULL); vk::Move makeFramebuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass, const vk::VkImageView colorAttachment, const deUint32 width, const deUint32 height, const deUint32 layers); -vk::Move makeCommandPool (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex); -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool); vk::VkImageMemoryBarrier makeImageMemoryBarrier (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask, const vk::VkImageLayout oldLayout, const vk::VkImageLayout newLayout, const vk::VkImage image, const vk::VkImageSubresourceRange subresourceRange); vk::VkBufferMemoryBarrier makeBufferMemoryBarrier (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask, const vk::VkBuffer buffer, const vk::VkDeviceSize offset, const vk::VkDeviceSize bufferSizeBytes); de::MovePtr bindImage (const vk::DeviceInterface& vk, const vk::VkDevice device, vk::Allocator& allocator, const vk::VkImage image, const vk::MemoryRequirement requirement); diff --git a/external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp index 9ae79c4..7166e14 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp @@ -513,8 +513,8 @@ tcu::TestStatus BinaryAtomicInstanceBase::iterate (void) const Unique pipeline(makeComputePipeline(deviceInterface, device, *pipelineLayout, *shaderModule)); // Create command buffer - const Unique cmdPool(makeCommandPool(deviceInterface, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(deviceInterface, device, *cmdPool)); + const Unique cmdPool(createCommandPool(deviceInterface, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer(allocateCommandBuffer(deviceInterface, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(deviceInterface, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp index ba27a7c..1ce80d3 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp @@ -445,8 +445,8 @@ tcu::TestStatus BaseTestInstance::iterate (void) const Unique pipelineLayout(makePipelineLayout(vk, device, descriptorSetLayout)); const Unique pipeline(makeComputePipeline(vk, device, *pipelineLayout, *shaderModule)); - const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdPool(createCommandPool(vk, device, VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT, queueFamilyIndex)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(vk, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp index 6f8bdac..77b0334 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp @@ -316,9 +316,9 @@ tcu::TestStatus test (Context& context, const CaseDef caseDef) // Prepare commands - const Unique pipelineLayout (makePipelineLayout (vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const tcu::IVec3 workSize = (caseDef.singleLayerBind ? caseDef.texture.layerSize() : caseDef.texture.size()); const int loopNumLayers = (caseDef.singleLayerBind ? numLayers : 1); diff --git a/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp index dabe758..400a42d 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp @@ -376,8 +376,8 @@ tcu::TestStatus MemoryQualifierInstanceBase::iterate (void) const vk::Unique pipeline(makeComputePipeline(deviceInterface, device, *pipelineLayout, *shaderModule)); // Create command buffer - const Unique cmdPool(makeCommandPool(deviceInterface, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(deviceInterface, device, *cmdPool)); + const Unique cmdPool(createCommandPool(deviceInterface, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer(allocateCommandBuffer(deviceInterface, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands beginCommandBuffer(deviceInterface, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp index 8ebff3d..7fa880a 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp @@ -303,8 +303,8 @@ tcu::TestStatus SizeTestInstance::iterate (void) const Unique pipelineLayout(makePipelineLayout(vk, device, descriptorSetLayout)); const Unique pipeline(makeComputePipeline(vk, device, *pipelineLayout, *shaderModule)); - const Unique cmdPool(makeCommandPool(vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdPool(createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(vk, *cmdBuffer); diff --git a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp index 437b830..1d70427 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp @@ -222,31 +222,6 @@ VkBufferImageCopy makeBufferImageCopy (const VkExtent3D extent, return copyParams; } -Move makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo commandPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - return createCommandPool(vk, device, &commandPoolParams); -} - -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo bufferAllocateParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - return allocateCommandBuffer(vk, device, &bufferAllocateParams); -} - Move makePipelineLayout (const DeviceInterface& vk, const VkDevice device, const VkDescriptorSetLayout descriptorSetLayout) @@ -414,13 +389,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceParams)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp index 039dca0..67fcc5f 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp @@ -105,14 +105,6 @@ deUint32 getNumPixels (const ImageType imageType, const tcu::UVec3& imageSize); deUint32 getDimensions (const ImageType imageType); //!< Coordinate dimension used for addressing (e.g. 3 (x,y,z) for 2d array) deUint32 getLayerDimensions (const ImageType imageType); //!< Coordinate dimension used for addressing a single layer (e.g. 2 (x,y) for 2d array) -vk::Move makeCommandPool (const vk::DeviceInterface& vk, - const vk::VkDevice device, - const deUint32 queueFamilyIndex); - -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, - const vk::VkDevice device, - const vk::VkCommandPool commandPool); - vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout); diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp index d93e058..3df4c35 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp @@ -486,24 +486,6 @@ struct TestConfig vk::VkSharingMode sharing; }; -vk::Move createCommandBuffer (const vk::DeviceInterface& vkd, - vk::VkDevice device, - vk::VkCommandPool pool, - vk::VkCommandBufferLevel level) -{ - const vk::VkCommandBufferAllocateInfo bufferInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - - pool, - level, - 1u - }; - - return vk::allocateCommandBuffer(vkd, device, &bufferInfo); -} - vk::Move createBeginCommandBuffer (const vk::DeviceInterface& vkd, vk::VkDevice device, vk::VkCommandPool pool, @@ -528,29 +510,13 @@ vk::Move createBeginCommandBuffer (const vk::DeviceInterfac (level == vk::VK_COMMAND_BUFFER_LEVEL_SECONDARY ? &inheritInfo : (const vk::VkCommandBufferInheritanceInfo*)DE_NULL), }; - vk::Move commandBuffer (createCommandBuffer(vkd, device, pool, level)); + vk::Move commandBuffer (allocateCommandBuffer(vkd, device, pool, level)); vkd.beginCommandBuffer(*commandBuffer, &beginInfo); return commandBuffer; } -vk::Move createCommandPool (const vk::DeviceInterface& vkd, - vk::VkDevice device, - deUint32 queueFamilyIndex) -{ - const vk::VkCommandPoolCreateInfo poolInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, - DE_NULL, - - vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, - queueFamilyIndex, - }; - - return vk::createCommandPool(vkd, device, &poolInfo); -} - vk::Move createBuffer (const vk::DeviceInterface& vkd, vk::VkDevice device, vk::VkDeviceSize size, @@ -1034,7 +1000,7 @@ public: , m_queue (queue) , m_queueFamilyIndex (queueFamilyIndex) , m_queues (queues) - , m_commandPool (createCommandPool(vkd, device, queueFamilyIndex)) + , m_commandPool (createCommandPool(vkd, device, vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)) , m_binaryCollection (binaryCollection) { for (size_t queueNdx = 0; queueNdx < m_queues.size(); queueNdx++) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp index 93ca41b..a9e7d63 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp @@ -691,29 +691,10 @@ BlendTestInstance::BlendTestInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -750,7 +731,7 @@ BlendTestInstance::BlendTestInstance (Context& context, { VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u } // VkImageSubresourceRange subresourceRange; }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -775,16 +756,7 @@ BlendTestInstance::BlendTestInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } BlendTestInstance::~BlendTestInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp index 33529df..2ea6851 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp @@ -550,43 +550,13 @@ CacheTestInstance::CacheTestInstance (Context& context, const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer - { - const VkCommandBufferAllocateInfo cmdAllocateParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdAllocateParams); - } + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); // Create the Pipeline Cache { diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp index 62b3012..be53d7f 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp @@ -695,29 +695,10 @@ DepthTestInstance::DepthTestInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -773,7 +754,7 @@ DepthTestInstance::DepthTestInstance (Context& context, }, }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -798,16 +779,7 @@ DepthTestInstance::DepthTestInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } DepthTestInstance::~DepthTestInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp index c45001e..2fe5963 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp @@ -691,29 +691,10 @@ ImageSamplingInstance::ImageSamplingInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -758,7 +739,7 @@ ImageSamplingInstance::ImageSamplingInstance (Context& context, preAttachmentBarriers[imgNdx].subresourceRange.layerCount = 1u; } - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -780,16 +761,7 @@ ImageSamplingInstance::ImageSamplingInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } ImageSamplingInstance::~ImageSamplingInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp index 4d750d2..0bc6922 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp @@ -238,40 +238,11 @@ de::MovePtr readColorAttachment (const vk::DeviceInterface& v } // Create command pool and buffer - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, device, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - - cmdBuffer = allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo); - } + cmdPool = createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); + cmdBuffer = allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, device, &fenceParams); - } + fence = createFence(vk, device); // Barriers for copying image to buffer @@ -429,40 +400,11 @@ void uploadTestTextureInternal (const DeviceInterface& vk, } // Create command pool and buffer - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, device, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - cmdBuffer = allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo); - } + cmdPool = createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); + cmdBuffer = allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, device, &fenceParams); - } + fence = createFence(vk, device); // Barriers for copying buffer to image const VkBufferMemoryBarrier preBufferBarrier = diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp index 61f5e40..44080d2 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp @@ -1355,29 +1355,10 @@ InputAssemblyInstance::InputAssemblyInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -1413,7 +1394,7 @@ InputAssemblyInstance::InputAssemblyInstance (Context& context, { VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u }, // VkImageSubresourceRange subresourceRange; }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -1434,16 +1415,7 @@ InputAssemblyInstance::InputAssemblyInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } InputAssemblyInstance::~InputAssemblyInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp index 7485b26..8a25c3e 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp @@ -116,29 +116,9 @@ VkImageMemoryBarrier makeImageMemoryBarrier (const VkAccessFlags srcAccessMask return barrier; } -Move makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - return createCommandPool(vk, device, &info); -} - Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) { - const VkCommandBufferAllocateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 commandBufferCount; - }; - return allocateCommandBuffer(vk, device, &info); + return allocateCommandBuffer(vk, device, commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } Move makeDescriptorSet (const DeviceInterface& vk, @@ -257,13 +237,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceInfo)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.hpp index b7e81f8..67a75d6 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.hpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.hpp @@ -77,7 +77,6 @@ private: }; vk::VkBufferCreateInfo makeBufferCreateInfo (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage); -vk::Move makeCommandPool (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex); vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool); vk::Move makeDescriptorSet (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device); diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolve.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolve.cpp index 4ad1644..c1fb1cf 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolve.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolve.cpp @@ -396,7 +396,7 @@ tcu::TestStatus MSInstanceBaseResolve::iterate (void) const Unique graphicsPipeline(createGraphicsPipeline(deviceInterface, device, DE_NULL, &graphicsPipelineInfo)); // Create command buffer for compute and transfer oparations - const Unique commandPool(makeCommandPool(deviceInterface, device, queueFamilyIndex)); + const Unique commandPool(createCommandPool(deviceInterface, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique commandBuffer(makeCommandBuffer(deviceInterface, device, *commandPool)); // Start recording commands diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolveAndPerSampleFetch.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolveAndPerSampleFetch.cpp index 6b670ca..3bf4569 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolveAndPerSampleFetch.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolveAndPerSampleFetch.cpp @@ -738,7 +738,7 @@ tcu::TestStatus MSInstanceBaseResolveAndPerSampleFetch::iterate (void) } // Create command buffer for compute and transfer oparations - const Unique commandPool(makeCommandPool(deviceInterface, device, queueFamilyIndex)); + const Unique commandPool(createCommandPool(deviceInterface, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique commandBuffer(makeCommandBuffer(deviceInterface, device, *commandPool)); // Start recording commands diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp index 5f808bf..85dc81e 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp @@ -771,7 +771,7 @@ void renderMultisampledImage (Context& context, const CaseDef& caseDef, const Vk const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); Allocator& allocator = context.getDefaultAllocator(); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkRect2D renderArea = { @@ -947,7 +947,7 @@ tcu::TestStatus test (Context& context, const CaseDef caseDef) const Unique colorImage (makeImage(vk, device, caseDef.colorFormat, caseDef.renderSize, caseDef.numLayers, caseDef.numSamples, colorImageUsage)); const UniquePtr colorImageAlloc (bindImage(vk, device, allocator, *colorImage, MemoryRequirement::Any)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkRect2D renderArea = { @@ -1206,7 +1206,7 @@ void renderAndResolve (Context& context, const CaseDef& caseDef, const VkBuffer VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT)); const UniquePtr resolveImageAlloc (bindImage(vk, device, allocator, *resolveImage, MemoryRequirement::Any)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); // Working image barrier, we change it based on which rendering stages were executed so far. diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp index b07ab5f..e4a9042 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp @@ -1951,29 +1951,10 @@ void MultisampleRenderer::initialize (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -2056,7 +2037,7 @@ void MultisampleRenderer::initialize (Context& context, }, }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -2082,16 +2063,7 @@ void MultisampleRenderer::initialize (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } MultisampleRenderer::~MultisampleRenderer (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp index 8ed5b5d..d49b7ae 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp @@ -1070,28 +1070,10 @@ PushConstantGraphicsTestInstance::PushConstantGraphicsTestInstance (Context& } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -1130,7 +1112,7 @@ PushConstantGraphicsTestInstance::PushConstantGraphicsTestInstance (Context& { VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u }, // VkImageSubresourceRange subresourceRange; }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -1215,16 +1197,7 @@ PushConstantGraphicsTestInstance::PushConstantGraphicsTestInstance (Context& } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } PushConstantGraphicsTestInstance::~PushConstantGraphicsTestInstance (void) @@ -1518,29 +1491,11 @@ PushConstantComputeTestInstance::PushConstantComputeTestInstance (Context& c } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); const VkCommandBufferBeginInfo cmdBufferBeginInfo = { @@ -1565,16 +1520,7 @@ PushConstantComputeTestInstance::PushConstantComputeTestInstance (Context& c } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } PushConstantComputeTestInstance::~PushConstantComputeTestInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp index 5f389eb..997b4a8 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp @@ -577,7 +577,7 @@ tcu::TestStatus test (Context& context, const CaseDef caseDef) const Unique renderPass (makeRenderPass (vk, device, caseDef.colorFormat, static_cast(numLayers))); const Unique pipelineLayout (makePipelineLayout (vk, device)); vector pipeline; - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); vector colorAttachments; diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp index b090c75..0cc4483 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp @@ -498,7 +498,7 @@ tcu::TestStatus ComputeTestInstance::iterate (void) const Unique shaderModule (createShaderModule (vk, device, m_context.getBinaryCollection().get("comp"), 0)); const Unique pipelineLayout(makePipelineLayout (vk, device, *descriptorSetLayout)); const Unique pipeline (makeComputePipeline(vk, device, *pipelineLayout, *shaderModule, pSpecInfo)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); beginCommandBuffer(vk, *cmdBuffer); @@ -623,7 +623,7 @@ tcu::TestStatus GraphicsTestInstance::iterate (void) const Unique renderPass (makeRenderPass (vk, device, imageFormat)); const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, 1u, &colorImageView.get(), static_cast(renderSize.x()), static_cast(renderSize.y()))); const Unique pipelineLayout(makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool (vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); GraphicsPipelineBuilder pipelineBuilder; diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp index 87a3a15..9622b7e 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp @@ -783,29 +783,10 @@ StencilTestInstance::StencilTestInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -861,7 +842,7 @@ StencilTestInstance::StencilTestInstance (Context& context, }, }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -886,16 +867,7 @@ StencilTestInstance::StencilTestInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } StencilTestInstance::~StencilTestInstance (void) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp index 43904eb..f64580f 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp @@ -703,31 +703,10 @@ TimestampTestInstance::TimestampTestInstance(Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer - { - const VkCommandBufferAllocateInfo cmdAllocateParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdAllocateParams); - } + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence { diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp index 198a67e..6b6a26e 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp @@ -1054,29 +1054,10 @@ VertexInputInstance::VertexInputInstance (Context& context, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - m_cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -1112,7 +1093,7 @@ VertexInputInstance::VertexInputInstance (Context& context, { VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u }, // VkImageSubresourceRange subresourceRange; }; - m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); + m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*m_cmdBuffer, &cmdBufferBeginInfo)); @@ -1155,16 +1136,7 @@ VertexInputInstance::VertexInputInstance (Context& context, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vk, vkDevice, &fenceParams); - } + m_fence = createFence(vk, vkDevice); } VertexInputInstance::~VertexInputInstance (void) diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp index 853b7f9..842e837 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp @@ -367,15 +367,7 @@ tcu::TestStatus BasicOcclusionQueryTestInstance::iterate (void) const CmdPoolCreateInfo cmdPoolCreateInfo (m_context.getUniversalQueueFamilyIndex()); vk::Move cmdPool = vk::createCommandPool(vk, device, &cmdPoolCreateInfo); - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Unique cmdBuffer (vk::allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + vk::Unique cmdBuffer (vk::allocateCommandBuffer(vk, device, *cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const CmdBufferBeginInfo beginInfo (0u); vk.beginCommandBuffer(*cmdBuffer, &beginInfo); @@ -779,15 +771,7 @@ vk::Move OcclusionQueryTestInstance::recordQueryPoolReset ( DE_ASSERT(hasSeparateResetCmdBuf()); - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo (0u); vk.beginCommandBuffer(*cmdBuffer, &beginInfo); @@ -802,15 +786,7 @@ vk::Move OcclusionQueryTestInstance::recordRender (vk::VkCo const vk::VkDevice device = m_context.getDevice(); const vk::DeviceInterface& vk = m_context.getDeviceInterface(); - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); CmdBufferBeginInfo beginInfo (0u); vk.beginCommandBuffer(*cmdBuffer, &beginInfo); @@ -882,15 +858,7 @@ vk::Move OcclusionQueryTestInstance::recordCopyResults (vk: const vk::VkDevice device = m_context.getDevice(); const vk::DeviceInterface& vk = m_context.getDeviceInterface(); - const vk::VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + vk::Move cmdBuffer (vk::allocateCommandBuffer(vk, device, cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const CmdBufferBeginInfo beginInfo (0u); vk.beginCommandBuffer(*cmdBuffer, &beginInfo); diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.hpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.hpp index 5b439b7..f12f291 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.hpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.hpp @@ -28,8 +28,8 @@ namespace vkt { - namespace QueryPool - { +namespace QueryPool +{ class QueryPoolOcclusionTests : public tcu::TestCaseGroup { diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp index 018d340..5ac7983 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp @@ -365,15 +365,7 @@ tcu::TestStatus ComputeInvocationsTestInstance::executeTest (const VkCommandPool }; const Unique pipeline(createComputePipeline(vk, device, DE_NULL , &pipelineCreateInfo)); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique cmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique queryPool (makeQueryPool(vk, device, VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT)); beginCommandBuffer(vk, *cmdBuffer); @@ -504,25 +496,8 @@ tcu::TestStatus ComputeInvocationsSecondaryTestInstance::executeTest (const VkCo pipeline.push_back(VkPipelineSp(new Unique(createComputePipeline(vk, device, DE_NULL , &pipelineCreateInfo)))); } - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); const Unique queryPool (makeQueryPool(vk, device, VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT)); @@ -679,25 +654,8 @@ tcu::TestStatus ComputeInvocationsSecondaryInheritedTestInstance::executeTest (c pipeline.push_back(VkPipelineSp(new Unique(createComputePipeline(vk, device, DE_NULL , &pipelineCreateInfo)))); } - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); const Unique queryPool (makeQueryPool(vk, device, VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT)); @@ -1058,15 +1016,7 @@ tcu::TestStatus VertexShaderTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique cmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(vk, *cmdBuffer); { @@ -1218,25 +1168,8 @@ tcu::TestStatus VertexShaderSecondaryTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); @@ -1306,25 +1239,8 @@ tcu::TestStatus VertexShaderSecondaryInheritedTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); @@ -1487,15 +1403,7 @@ tcu::TestStatus GeometryShaderTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique cmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(vk, *cmdBuffer); { @@ -1626,25 +1534,8 @@ tcu::TestStatus GeometryShaderSecondaryTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); @@ -1714,25 +1605,8 @@ tcu::TestStatus GeometryShaderSecondaryInheritedTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); @@ -1894,15 +1768,7 @@ tcu::TestStatus TessellationShaderTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique cmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer(vk, *cmdBuffer); { @@ -2002,25 +1868,8 @@ tcu::TestStatus TessellationShaderSecondrayTestInstance::executeTest (void) const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); @@ -2093,25 +1942,8 @@ tcu::TestStatus TessellationShaderSecondrayInheritedTestInstance::executeTest (v const de::SharedPtr vertexBufferSp = creatAndFillVertexBuffer(); const VkBuffer vertexBuffer = vertexBufferSp->object(); - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, &cmdBufferAllocateInfo)); - - const VkCommandBufferAllocateInfo secondaryCmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_SECONDARY, // VkCommandBufferLevel level; - 1u // deUint32 commandBufferCount; - }; - const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, &secondaryCmdBufferAllocateInfo)); + const Unique primaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const Unique secondaryCmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_SECONDARY)); beginSecondaryCommandBuffer(vk, *secondaryCmdBuffer, m_parametersGraphic.queryStatisticFlags, *m_renderPass, *m_framebuffer, VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT); vk.cmdBindPipeline(*secondaryCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, *m_pipeline); diff --git a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp index 5c91757..935c0b8 100644 --- a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp +++ b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp @@ -217,17 +217,7 @@ BaseRenderingTestInstance::BaseRenderingTestInstance (Context& context, VkSample DescriptorSetLayoutBuilder descriptorSetLayoutBuilder; // Command Pool - { - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_commandPool = createCommandPool(vkd, vkDevice, &cmdPoolCreateInfo, DE_NULL); - } + m_commandPool = createCommandPool(vkd, vkDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); // Image { @@ -546,16 +536,7 @@ BaseRenderingTestInstance::BaseRenderingTestInstance (Context& context, VkSample } // Fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_FENCE_CREATE_SIGNALED_BIT // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vkd, vkDevice, &fenceParams); - } + m_fence = createFence(vkd, vkDevice); // Result Buffer { @@ -806,18 +787,7 @@ void BaseRenderingTestInstance::drawPrimitives (tcu::Surface& result, const std: } // Create Command Buffer - { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1 // deUint32 commandBufferCount; - }; - - commandBuffer = allocateCommandBuffer(vkd, vkDevice, &cmdBufferAllocateInfo); - } + commandBuffer = allocateCommandBuffer(vkd, vkDevice, *m_commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Begin Command Buffer { diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp index 73ec5be..c945bc7 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp @@ -1191,29 +1191,10 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1 // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -1233,7 +1214,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void &attachmentClearValues[0] // const VkClearValue* pAttachmentClearValues; }; - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); @@ -1269,16 +1250,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); // Execute Draw { @@ -1317,25 +1289,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void }; // constants for image copy - - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - Move copyCmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *copyCmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 bufferCount; - }; + Move copyCmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); const VkCommandBufferBeginInfo cmdBufferBeginInfo = { @@ -1383,7 +1337,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void // Copy image to buffer { - Move copyCmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + Move copyCmdBuffer = allocateCommandBuffer(vk, vkDevice, *copyCmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); const VkSubmitInfo submitInfo = { @@ -1962,28 +1916,9 @@ void ComputeShaderExecutor::execute (const Context& ctx, int numValues, const vo uploadInputBuffer(ctx, inputs, numValues); // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -2064,15 +1999,7 @@ void ComputeShaderExecutor::execute (const Context& ctx, int numValues, const vo } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); const int maxValuesPerInvocation = ctx.getDeviceProperties().limits.maxComputeWorkGroupSize[0]; int curOffset = 0; @@ -2114,7 +2041,7 @@ void ComputeShaderExecutor::execute (const Context& ctx, int numValues, const vo descriptorSetUpdateBuilder.update(vk, vkDevice); } - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); vk.cmdBindPipeline(*cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, *computePipeline); @@ -2613,29 +2540,10 @@ void TessellationExecutor::renderTess (const Context& ctx, deUint32 numValues, d } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // uint32_t bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -2660,7 +2568,7 @@ void TessellationExecutor::renderTess (const Context& ctx, deUint32 numValues, d clearValues // const VkClearValue* pClearValues; }; - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); @@ -2677,15 +2585,7 @@ void TessellationExecutor::renderTess (const Context& ctx, deUint32 numValues, d } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); // Execute Draw { @@ -3210,40 +3110,11 @@ void ShaderExecutor::uploadImage (const VkDevice& vkDevice, } // Create command pool and buffer - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); // Barriers for copying buffer to image const VkBufferMemoryBarrier preBufferBarrier = diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp index c1884d2..7152f5c 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp @@ -628,9 +628,9 @@ ShaderRenderCaseInstance::SparseContext::SparseContext (vkt::Context& context) , m_queueFamilyIndex (findQueueFamilyIndexWithCaps(context.getInstanceInterface(), context.getPhysicalDevice(), VK_QUEUE_GRAPHICS_BIT|VK_QUEUE_SPARSE_BINDING_BIT)) , m_device (createDevice()) , m_deviceInterface (context.getInstanceInterface(), *m_device) + , m_queue (getDeviceQueue(m_deviceInterface, *m_device, m_queueFamilyIndex, 0)) , m_allocator (createAllocator()) { - m_deviceInterface.getDeviceQueue(*m_device, m_queueFamilyIndex, 0, &m_queue); } Move ShaderRenderCaseInstance::SparseContext::createDevice () const @@ -1089,40 +1089,11 @@ void ShaderRenderCaseInstance::uploadImage (const tcu::TextureFormat& texForma } // Create command pool and buffer - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); // Barriers for copying buffer to image const VkBufferMemoryBarrier preBufferBarrier = @@ -1276,40 +1247,11 @@ void ShaderRenderCaseInstance::clearImage (const tcu::Sampler& refSampler, // Create command pool and buffer - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); const VkImageMemoryBarrier preImageBarrier = { @@ -1400,19 +1342,6 @@ void ShaderRenderCaseInstance::clearImage (const tcu::Sampler& refSampler, VK_CHECK(vk.waitForFences(vkDevice, 1, &fence.get(), true, ~(0ull) /* infinity */)); } -// Sparse utility function -Move makeSemaphore (const DeviceInterface& vk, const VkDevice device) -{ - const VkSemaphoreCreateInfo semaphoreCreateInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, - DE_NULL, - 0u - }; - - return createSemaphore(vk, device, &semaphoreCreateInfo); -} - VkExtent3D mipLevelExtents (const VkExtent3D& baseExtents, const deUint32 mipLevel) { VkExtent3D result; @@ -1496,7 +1425,7 @@ void ShaderRenderCaseInstance::uploadSparseImage (const tcu::TextureFormat& tex const bool isShadowSampler = refSampler.compare != tcu::Sampler::COMPAREMODE_NONE; const VkImageAspectFlags aspectMask = isShadowSampler ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT; - const Unique imageMemoryBindSemaphore(makeSemaphore(vk, vkDevice)); + const Unique imageMemoryBindSemaphore(createSemaphore(vk, vkDevice)); deUint32 bufferSize = 0u; std::vector offsetMultiples; offsetMultiples.push_back(4u); @@ -1706,32 +1635,12 @@ void ShaderRenderCaseInstance::uploadSparseImage (const tcu::TextureFormat& tex Move cmdPool; Move cmdBuffer; - // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } - - { - // Create command buffer - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; + // Create command pool + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferAllocateInfo); - } + // Create command buffer + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Create source buffer const VkBufferCreateInfo bufferParams = @@ -1878,14 +1787,7 @@ void ShaderRenderCaseInstance::uploadSparseImage (const tcu::TextureFormat& tex DE_NULL // const VkSemaphore* pSignalSemaphores; }; - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - - Move fence = createFence(vk, vkDevice, &fenceParams); + Move fence = createFence(vk, vkDevice); try { @@ -2858,29 +2760,10 @@ void ShaderRenderCaseInstance::render (deUint32 numVertices, } // Create command pool - { - const VkCommandPoolCreateInfo cmdPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - - cmdPool = createCommandPool(vk, vkDevice, &cmdPoolParams); - } + cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex); // Create command buffer { - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -2905,7 +2788,7 @@ void ShaderRenderCaseInstance::render (deUint32 numVertices, &clearValues, // const VkClearValue* pClearValues; }; - cmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + cmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); @@ -2987,15 +2870,7 @@ void ShaderRenderCaseInstance::render (deUint32 numVertices, } // Create fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u // VkFenceCreateFlags flags; - }; - fence = createFence(vk, vkDevice, &fenceParams); - } + fence = createFence(vk, vkDevice); // Execute Draw { @@ -3037,15 +2912,6 @@ void ShaderRenderCaseInstance::render (deUint32 numVertices, VK_CHECK(vk.bindBufferMemory(vkDevice, *readImageBuffer, readImageBufferMemory->getMemory(), readImageBufferMemory->getOffset())); // Copy image to buffer - const VkCommandBufferAllocateInfo cmdBufferParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool cmdPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u // deUint32 bufferCount; - }; - const VkCommandBufferBeginInfo cmdBufferBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; @@ -3054,7 +2920,7 @@ void ShaderRenderCaseInstance::render (deUint32 numVertices, (const VkCommandBufferInheritanceInfo*)DE_NULL, }; - const Move resultCmdBuffer = allocateCommandBuffer(vk, vkDevice, &cmdBufferParams); + const Move resultCmdBuffer = allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); const VkBufferImageCopy copyParams = { diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp index f639cb0..682c7e8 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp @@ -534,7 +534,7 @@ private: const deUint32 m_queueFamilyIndex; vk::Unique m_device; vk::DeviceDriver m_deviceInterface; - vk::VkQueue m_queue; + const vk::VkQueue m_queue; const de::UniquePtr m_allocator; private: vk::Move createDevice (void) const; diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp index 177ef36..cfd080a 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp @@ -164,10 +164,7 @@ void SparseResourcesBaseInstance::createDeviceSupportingQueues(const QueueRequir { Queue& queue = queuesIter->second[queueNdx]; - VkQueue queueHandle = 0; - m_deviceDriver->getDeviceQueue(*m_logicalDevice, queue.queueFamilyIndex, queue.queueIndex, &queueHandle); - - queue.queueHandle = queueHandle; + queue.queueHandle = getDeviceQueue(*m_deviceDriver, *m_logicalDevice, queue.queueFamilyIndex, queue.queueIndex); } } } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp index b5839a6..38d6791 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp @@ -202,7 +202,7 @@ tcu::TestStatus BufferSparseMemoryAliasingInstance::iterate (void) const Unique sparseBufferRead (createBuffer(deviceInterface, getDevice(), &bufferCreateInfo)); // Create sparse buffers memory bind semaphore - const Unique bufferMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique bufferMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); const VkMemoryRequirements bufferMemRequirements = getBufferMemoryRequirements(deviceInterface, getDevice(), *sparseBufferWrite); @@ -263,7 +263,7 @@ tcu::TestStatus BufferSparseMemoryAliasingInstance::iterate (void) // Create command buffer for compute and data transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands beginCommandBuffer(deviceInterface, *commandBuffer); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp index 1eec940..1a658ed 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp @@ -141,7 +141,7 @@ tcu::TestStatus BufferSparseBindingInstance::iterate (void) const Unique sparseBuffer(createBuffer(deviceInterface, getDevice(), &bufferCreateInfo)); // Create sparse buffer memory bind semaphore - const Unique bufferMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique bufferMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); const VkMemoryRequirements bufferMemRequirement = getBufferMemoryRequirements(deviceInterface, getDevice(), *sparseBuffer); @@ -193,7 +193,7 @@ tcu::TestStatus BufferSparseBindingInstance::iterate (void) // Create command buffer for transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording transfer commands beginCommandBuffer(deviceInterface, *commandBuffer); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp index b5575c5..b23910f 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp @@ -183,7 +183,7 @@ tcu::TestStatus BufferSparseResidencyInstance::iterate (void) const Unique sparseBuffer(createBuffer(deviceInterface, getDevice(), &bufferCreateInfo)); // Create sparse buffer memory bind semaphore - const Unique bufferMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique bufferMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); const VkMemoryRequirements bufferMemRequirements = getBufferMemoryRequirements(deviceInterface, getDevice(), *sparseBuffer); @@ -257,7 +257,7 @@ tcu::TestStatus BufferSparseResidencyInstance::iterate (void) // Create command buffer for compute and data transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording compute and transfer commands beginCommandBuffer(deviceInterface, *commandBuffer); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp index 991a528..67a055d 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp @@ -576,7 +576,7 @@ public: m_pipelineLayout = makePipelineLayout (vk, device, m_descriptorSetLayout); m_pipeline = makeGraphicsPipeline (vk, device, *m_pipelineLayout, *m_renderPass, m_renderSize, m_topology, DE_LENGTH_OF_ARRAY(pShaderStages), pShaderStages); m_cmdPool = makeCommandPool (vk, device, queueFamilyIndex); - m_cmdBuffer = makeCommandBuffer (vk, device, *m_cmdPool); + m_cmdBuffer = allocateCommandBuffer (vk, device, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); } void draw (const DeviceInterface& vk, @@ -720,7 +720,7 @@ void bindSparseBuffer (const DeviceInterface& vk, const VkDevice device, const V DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - const Unique fence(makeFence(vk, device)); + const Unique fence(createFence(vk, device)); VK_CHECK(vk.queueBindSparse(sparseQueue, 1u, &bindInfo, *fence)); VK_CHECK(vk.waitForFences(device, 1u, &fence.get(), VK_TRUE, ~0ull)); @@ -1036,8 +1036,8 @@ public: stagingBufferSize, // VkDeviceSize size; }; - const Unique cmdPool (makeCommandPool (vk, getDevice(), m_universalQueue.queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, getDevice(), *cmdPool)); + const Unique cmdPool (makeCommandPool(vk, getDevice(), m_universalQueue.queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, getDevice(), *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer (vk, *cmdBuffer); vk.cmdCopyBuffer (*cmdBuffer, *stagingBuffer, *sparseBuffer, 1u, ©Region); @@ -1286,8 +1286,8 @@ public: }, }; - const Unique cmdPool (makeCommandPool (vk, getDevice(), m_universalQueue.queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, getDevice(), *cmdPool)); + const Unique cmdPool (makeCommandPool(vk, getDevice(), m_universalQueue.queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, getDevice(), *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); beginCommandBuffer (vk, *cmdBuffer); vk.cmdCopyBuffer (*cmdBuffer, *m_stagingBuffer, *m_sparseBuffer, DE_LENGTH_OF_ARRAY(copyRegions), copyRegions); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp index 60dc2a2..1dcfbbd 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp @@ -243,8 +243,8 @@ tcu::TestStatus ImageSparseMemoryAliasingInstance::iterate (void) const Unique imageWrite(createImage(deviceInterface, getDevice(), &imageSparseInfo)); // Create semaphores to synchronize sparse binding operations with other operations on the sparse images - const Unique memoryBindSemaphoreTransfer(makeSemaphore(deviceInterface, getDevice())); - const Unique memoryBindSemaphoreCompute(makeSemaphore(deviceInterface, getDevice())); + const Unique memoryBindSemaphoreTransfer(createSemaphore(deviceInterface, getDevice())); + const Unique memoryBindSemaphoreCompute(createSemaphore(deviceInterface, getDevice())); const VkSemaphore imageMemoryBindSemaphores[] = { memoryBindSemaphoreTransfer.get(), memoryBindSemaphoreCompute.get() }; @@ -390,7 +390,7 @@ tcu::TestStatus ImageSparseMemoryAliasingInstance::iterate (void) // Create command buffer for compute and transfer oparations const Unique commandPool (makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); std::vector bufferImageCopy(imageSparseInfo.mipLevels); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp index 4a8b652..37b47b6 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp @@ -176,7 +176,7 @@ tcu::TestStatus ImageSparseBindingInstance::iterate (void) const Unique imageSparse(createImage(deviceInterface, getDevice(), &imageSparseInfo)); // Create sparse image memory bind semaphore - const Unique imageMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique imageMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); // Get sparse image general memory requirements const VkMemoryRequirements imageSparseMemRequirements = getImageMemoryRequirements(deviceInterface, getDevice(), *imageSparse); @@ -229,7 +229,7 @@ tcu::TestStatus ImageSparseBindingInstance::iterate (void) // Create command buffer for compute and transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); std::vector bufferImageCopy(imageSparseInfo.mipLevels); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp index d915878..20decb2 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp @@ -254,7 +254,7 @@ tcu::TestStatus ImageSparseResidencyInstance::iterate (void) const Unique sparseImage(createImage(deviceInterface, getDevice(), &imageCreateInfo)); // Create sparse image memory bind semaphore - const Unique imageMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique imageMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); { // Get image general memory requirements @@ -397,7 +397,7 @@ tcu::TestStatus ImageSparseResidencyInstance::iterate (void) // Create command buffer for compute and transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Start recording commands beginCommandBuffer(deviceInterface, *commandBuffer); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp index 5df9758..6616df0 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp @@ -192,7 +192,7 @@ tcu::TestStatus MipmapSparseResidencyInstance::iterate (void) const Unique imageSparse(createImage(deviceInterface, getDevice(), &imageSparseInfo)); // Create sparse image memory bind semaphore - const Unique imageMemoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique imageMemoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); { // Get sparse image general memory requirements @@ -312,7 +312,7 @@ tcu::TestStatus MipmapSparseResidencyInstance::iterate (void) // Create command buffer for compute and transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), computeQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); std::vector bufferImageCopy(imageSparseInfo.mipLevels); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp index da019c5..5476932 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp @@ -191,13 +191,13 @@ public: for (deUint32 i = 0; i < m_params.numWaitSemaphores; ++i) { - allSemaphores.push_back(makeVkSharedPtr(makeSemaphore(vk, getDevice()))); + allSemaphores.push_back(makeVkSharedPtr(createSemaphore(vk, getDevice()))); waitSemaphores.push_back(**allSemaphores.back()); } for (deUint32 i = 0; i < m_params.numSignalSemaphores; ++i) { - allSemaphores.push_back(makeVkSharedPtr(makeSemaphore(vk, getDevice()))); + allSemaphores.push_back(makeVkSharedPtr(createSemaphore(vk, getDevice()))); signalSemaphores.push_back(**allSemaphores.back()); signalSemaphoresWaitDstStageMask.push_back(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT); } @@ -277,7 +277,7 @@ public: if (m_params.bindSparseUseFence) { - bindSparseFences.push_back(makeVkSharedPtr(makeFence(vk, getDevice()))); + bindSparseFences.push_back(makeVkSharedPtr(createFence(vk, getDevice()))); fence = **bindSparseFences.back(); } @@ -288,7 +288,7 @@ public: } else { - regularFences.push_back(makeVkSharedPtr(makeFence(vk, getDevice()))); + regularFences.push_back(makeVkSharedPtr(createFence(vk, getDevice()))); VK_CHECK(vk.queueSubmit(submissionIter->queue->queueHandle, 1u, &submissionIter->info.regular, **regularFences.back())); } } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp index 4f5ff4b..7077d45 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp @@ -260,7 +260,7 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) const Unique imageSparse(createImage(deviceInterface, getDevice(), &imageSparseInfo)); // Create sparse image memory bind semaphore - const Unique memoryBindSemaphore(makeSemaphore(deviceInterface, getDevice())); + const Unique memoryBindSemaphore(createSemaphore(deviceInterface, getDevice())); const deUint32 imageSparseSizeInBytes = getImageSizeInBytes(imageSparseInfo.extent, imageSparseInfo.arrayLayers, m_format, imageSparseInfo.mipLevels, BUFFER_IMAGE_COPY_OFFSET_GRANULARITY); const deUint32 imageSizeInPixels = getImageSizeInBytes(imageSparseInfo.extent, imageSparseInfo.arrayLayers, m_format, imageSparseInfo.mipLevels) / tcu::getPixelSize(m_format); @@ -444,7 +444,7 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) // Create command buffer for compute and transfer oparations const Unique commandPool(makeCommandPool(deviceInterface, getDevice(), extractQueue.queueFamilyIndex)); - const Unique commandBuffer(makeCommandBuffer(deviceInterface, getDevice(), *commandPool)); + const Unique commandBuffer(allocateCommandBuffer(deviceInterface, getDevice(), *commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); std::vector bufferImageSparseCopy(imageSparseInfo.mipLevels); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp index 108600a..d5eab7d 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp @@ -261,19 +261,6 @@ Move makeCommandPool (const DeviceInterface& vk, const VkDevice d return createCommandPool(vk, device, &commandPoolParams); } -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo bufferAllocateParams = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 bufferCount; - }; - return allocateCommandBuffer(vk, device, &bufferAllocateParams); -} - Move makePipelineLayout (const DeviceInterface& vk, const VkDevice device, const VkDescriptorSetLayout descriptorSetLayout) @@ -377,29 +364,6 @@ Move makeDescriptorSet (const DeviceInterface& vk, return allocateDescriptorSet(vk, device, &allocateParams); } -Move makeSemaphore (const DeviceInterface& vk, const VkDevice device) -{ - const VkSemaphoreCreateInfo semaphoreCreateInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, - DE_NULL, - 0u - }; - - return createSemaphore(vk, device, &semaphoreCreateInfo); -} - -Move makeFence (const DeviceInterface& vk, const VkDevice device, const VkFenceCreateFlags flags) -{ - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - flags, // VkFenceCreateFlags flags; - }; - return createFence(vk, device, &fenceCreateInfo); -} - Move makeFramebuffer (const DeviceInterface& vk, const VkDevice device, const VkRenderPass renderPass, diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp index c04e8da..ff9852b 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp @@ -142,10 +142,6 @@ vk::Move makeCommandPool (const vk::DeviceInterface& const vk::VkDevice device, const deUint32 queueFamilyIndex); -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, - const vk::VkDevice device, - const vk::VkCommandPool commandPool); - vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout = DE_NULL); @@ -175,13 +171,6 @@ vk::Move makeDescriptorSet (const vk::DeviceInterface& const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); -vk::Move makeSemaphore (const vk::DeviceInterface& vk, - const vk::VkDevice device); - -vk::Move makeFence (const vk::DeviceInterface& vk, - const vk::VkDevice device, - const vk::VkFenceCreateFlags flags = 0u); - vk::Move makeFramebuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass, diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp index b2247ca..852fff1 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp @@ -222,15 +222,7 @@ Move createComputePipeline (const DeviceInterface& vkdi, const VkDev *//*--------------------------------------------------------------------*/ Move createCommandPool (const DeviceInterface& vkdi, VkDevice device, deUint32 queueFamilyIndex) { - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType - DE_NULL, // pNext - 0u, // flags - queueFamilyIndex, // queueFamilyIndex - }; - - return createCommandPool(vkdi, device, &cmdPoolCreateInfo); + return createCommandPool(vkdi, device, 0u, queueFamilyIndex); } } // anonymous @@ -347,16 +339,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void) // Create command buffer and record commands const Unique cmdPool (createCommandPool(vkdi, device, m_context.getUniversalQueueFamilyIndex())); - const VkCommandBufferAllocateInfo cmdBufferCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType - NULL, // pNext - *cmdPool, // cmdPool - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u // count - }; - - Unique cmdBuffer (allocateCommandBuffer(vkdi, device, &cmdBufferCreateInfo)); + Unique cmdBuffer (allocateCommandBuffer(vkdi, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const VkCommandBufferBeginInfo cmdBufferBeginInfo = { @@ -376,13 +359,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void) // Create fence and run. - const VkFenceCreateInfo fenceCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType - NULL, // pNext - 0 // flags - }; - const Unique cmdCompleteFence (createFence(vkdi, device, &fenceCreateInfo)); + const Unique cmdCompleteFence (createFence(vkdi, device)); const deUint64 infiniteTimeout = ~(deUint64)0u; const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index eb7ebd6..63498be 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -5643,25 +5643,10 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan }; const Unique 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 cmdPool (createCommandPool(vk, vkDevice, &cmdPoolParams)); + const Unique 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 cmdBuf (allocateCommandBuffer(vk, vkDevice, &cmdBufParams)); + const Unique cmdBuf (allocateCommandBuffer(vk, vkDevice, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const VkCommandBufferBeginInfo cmdBufBeginParams = { @@ -5804,13 +5789,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 fence (createFence(vk, vkDevice, &fenceParams)); + const Unique fence (createFence(vk, vkDevice)); const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, diff --git a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp index e4a18e8..c9d67a4 100644 --- a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp +++ b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp @@ -2103,24 +2103,8 @@ tcu::TestStatus SSBOLayoutCaseInstance::iterate (void) }; vk::Move pipeline(createComputePipeline(vk, device, DE_NULL, &pipelineCreateInfo)); - const vk::VkCommandPoolCreateInfo cmdPoolParams = - { - vk::VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCmdPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - vk::Move cmdPool (createCommandPool(vk, device, &cmdPoolParams)); - - const vk::VkCommandBufferAllocateInfo cmdBufParams = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *cmdPool, // VkCmdPool pool; - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCmdBufferLevel level; - 1u, // deUint32 bufferCount; - }; - vk::Move cmdBuffer (allocateCommandBuffer(vk, device, &cmdBufParams)); + vk::Move cmdPool (createCommandPool(vk, device, vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); + vk::Move cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const vk::VkCommandBufferBeginInfo cmdBufBeginParams = { @@ -2138,13 +2122,7 @@ tcu::TestStatus SSBOLayoutCaseInstance::iterate (void) VK_CHECK(vk.endCommandBuffer(*cmdBuffer)); - const vk::VkFenceCreateInfo fenceParams = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - vk::Move fence (createFence(vk, device, &fenceParams)); + vk::Move fence (createFence(vk, device)); const vk::VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp index cb9b426..723ff91 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp @@ -83,7 +83,7 @@ tcu::TestStatus deviceResetSetEventCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkSubmitInfo submitInfo = { @@ -97,13 +97,7 @@ tcu::TestStatus deviceResetSetEventCase (Context& context) 0u, // deUint32 signalSemaphoreCount; DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - const VkEventCreateInfo eventInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0 - }; - const Unique event (createEvent(vk, device, &eventInfo, DE_NULL)); + const Unique event (createEvent(vk, device)); beginCommandBuffer(vk, *cmdBuffer); vk.cmdSetEvent(*cmdBuffer, *event, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); @@ -134,14 +128,8 @@ tcu::TestStatus deviceWaitForEventCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceInfo)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique fence (createFence(vk, device)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkSubmitInfo submitInfo = { @@ -187,14 +175,8 @@ tcu::TestStatus singleSubmissionCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceInfo)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique fence (createFence(vk, device)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move ptrCmdBuffer[COUNT] = {makeCommandBuffer(vk, device, *cmdPool), makeCommandBuffer(vk, device, *cmdPool)}; VkCommandBuffer cmdBuffers[COUNT] = {*ptrCmdBuffer[SET], *ptrCmdBuffer[WAIT]}; const VkSubmitInfo submitInfo = @@ -209,13 +191,7 @@ tcu::TestStatus singleSubmissionCase (Context& context) 0u, // deUint32 signalSemaphoreCount; DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - const VkEventCreateInfo eventInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0 - }; - const Unique event (createEvent(vk, device, &eventInfo, DE_NULL)); + const Unique event (createEvent(vk, device)); beginCommandBuffer(vk, cmdBuffers[SET]); vk.cmdSetEvent(cmdBuffers[SET], *event, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); @@ -239,15 +215,13 @@ tcu::TestStatus multiSubmissionCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Move ptrFence[COUNT] = {createFence(vk, device, &fenceInfo), createFence(vk, device, &fenceInfo)}; + const Move ptrFence[COUNT] = + { + createFence(vk, device), + createFence(vk, device) + }; VkFence fence[COUNT] = {*ptrFence[SET], *ptrFence[WAIT]}; - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move ptrCmdBuffer[COUNT] = {makeCommandBuffer(vk, device, *cmdPool), makeCommandBuffer(vk, device, *cmdPool)}; VkCommandBuffer cmdBuffers[COUNT] = {*ptrCmdBuffer[SET], *ptrCmdBuffer[WAIT]}; const VkSubmitInfo submitInfo[COUNT] = @@ -275,13 +249,7 @@ tcu::TestStatus multiSubmissionCase (Context& context) DE_NULL, // const VkSemaphore* pSignalSemaphores; } }; - const VkEventCreateInfo eventInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0 - }; - const Unique event (createEvent(vk, device, &eventInfo, DE_NULL)); + const Unique event (createEvent(vk, device)); beginCommandBuffer(vk, cmdBuffers[SET]); vk.cmdSetEvent(cmdBuffers[SET], *event, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); @@ -307,14 +275,8 @@ tcu::TestStatus secondaryCommandBufferCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceInfo)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique fence (createFence(vk, device)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move primaryCmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkCommandBufferAllocateInfo cmdBufferInfo = { @@ -338,13 +300,7 @@ tcu::TestStatus secondaryCommandBufferCase (Context& context) 0u, // deUint32 signalSemaphoreCount; DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - const VkEventCreateInfo eventInfo = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, - DE_NULL, - 0 - }; - const Unique event (createEvent(vk, device, &eventInfo, DE_NULL)); + const Unique event (createEvent(vk, device)); const VkCommandBufferInheritanceInfo secCmdBufInheritInfo = { diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp index b19b6ed..43a0ece 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp @@ -46,7 +46,7 @@ tcu::TestStatus basicOneFenceCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkFenceCreateInfo fenceInfo = { @@ -104,7 +104,7 @@ tcu::TestStatus basicMultiFenceCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkFenceCreateInfo fenceInfo = { diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp index 5dfe6f9..a58b320 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp @@ -49,14 +49,8 @@ tcu::TestStatus basicOneQueueCase (Context& context) const VkDevice device = context.getDevice(); const VkQueue queue = context.getUniversalQueue(); const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const VkSemaphoreCreateInfo semaphoreInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkSemaphoreCreateFlags flags; - }; - const Unique semaphore (createSemaphore (vk, device, &semaphoreInfo, DE_NULL)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique semaphore (createSemaphore (vk, device)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkCommandBufferBeginInfo info = { @@ -91,13 +85,7 @@ tcu::TestStatus basicOneQueueCase (Context& context) DE_NULL, // const VkSemaphore* pSignalSemaphores; } }; - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence (createFence(vk, device, &fenceInfo)); + const Unique fence (createFence(vk, device)); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &info)); endCommandBuffer(vk, *cmdBuffer); @@ -142,23 +130,11 @@ tcu::TestStatus basicMultiQueueCase (Context& context) VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT, // VkCommandBufferUsageFlags flags; DE_NULL, // const VkCommandBufferInheritanceInfo* pInheritanceInfo; }; - const VkSemaphoreCreateInfo semaphoreInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkSemaphoreCreateFlags flags; - }; Move semaphore; Move cmdPool[COUNT]; Move cmdBuffer[COUNT]; const VkPipelineStageFlags stageBits[] = { VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT }; VkSubmitInfo submitInfo[COUNT]; - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; Move fence[COUNT]; queueFamilyProperties = getPhysicalDeviceQueueFamilyProperties(instance, physicalDevice); @@ -219,9 +195,9 @@ tcu::TestStatus basicMultiQueueCase (Context& context) vk.getDeviceQueue(*logicalDevice, queues[queueReqNdx].queueFamilyIndex, 0u, &queues[queueReqNdx].queue); } - semaphore = (createSemaphore (vk,*logicalDevice, &semaphoreInfo, DE_NULL)); - cmdPool[FIRST] = (makeCommandPool(vk, *logicalDevice, queues[FIRST].queueFamilyIndex)); - cmdPool[SECOND] = (makeCommandPool(vk, *logicalDevice, queues[SECOND].queueFamilyIndex)); + semaphore = (createSemaphore (vk, *logicalDevice)); + cmdPool[FIRST] = (createCommandPool(vk, *logicalDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queues[FIRST].queueFamilyIndex)); + cmdPool[SECOND] = (createCommandPool(vk, *logicalDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queues[SECOND].queueFamilyIndex)); cmdBuffer[FIRST] = (makeCommandBuffer(vk, *logicalDevice, *cmdPool[FIRST])); cmdBuffer[SECOND] = (makeCommandBuffer(vk, *logicalDevice, *cmdPool[SECOND])); @@ -250,8 +226,8 @@ tcu::TestStatus basicMultiQueueCase (Context& context) VK_CHECK(vk.beginCommandBuffer(*cmdBuffer[SECOND], &info)); endCommandBuffer(vk, *cmdBuffer[SECOND]); - fence[FIRST] = (createFence(vk, *logicalDevice, &fenceInfo)); - fence[SECOND] = (createFence(vk, *logicalDevice, &fenceInfo)); + fence[FIRST] = (createFence(vk, *logicalDevice)); + fence[SECOND] = (createFence(vk, *logicalDevice)); VK_CHECK(vk.queueSubmit(queues[FIRST].queue, 1u, &submitInfo[FIRST], *fence[FIRST])); VK_CHECK(vk.queueSubmit(queues[SECOND].queue, 1u, &submitInfo[SECOND], *fence[SECOND])); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp index 0a41b37..77c166a 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp @@ -334,7 +334,7 @@ TestStatus executeComputePipeline (const Context& context, const VkPipeline& pip .build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u)); Buffer resultBuffer (vk, device, *queues.m_allocator, makeBufferCreateInfo(BUFFER_SIZE, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT), MemoryRequirement::HostVisible); const VkBufferMemoryBarrier bufferBarrier = makeBufferMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, *resultBuffer, 0ull, BUFFER_SIZE); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); { @@ -417,7 +417,7 @@ TestStatus executeGraphicPipeline (const Context& context, const VkPipeline& pip MemoryRequirement::Any)); Move colorAttachmentView = makeImageView(vk, device, **colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange); Move framebuffer = makeFramebuffer(vk, device, renderPass, *colorAttachmentView, colorImageExtent.width, colorImageExtent.height, 1u); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const VkDescriptorBufferInfo outputBufferDescriptorInfo = makeDescriptorBufferInfo(*resultBuffer, 0ull, BUFFER_SIZE); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp index 0f14ef9..5844e31 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp @@ -319,8 +319,8 @@ public: const Move cmdPool[] = { - makeCommandPool(vk, device, queuePairs[pairNdx].familyIndexWrite), - makeCommandPool(vk, device, queuePairs[pairNdx].familyIndexRead) + createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queuePairs[pairNdx].familyIndexWrite), + createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queuePairs[pairNdx].familyIndexRead) }; const Move ptrCmdBuffer[] = { @@ -332,13 +332,7 @@ public: *ptrCmdBuffer[QUEUETYPE_WRITE], *ptrCmdBuffer[QUEUETYPE_READ] }; - const VkSemaphoreCreateInfo semaphoreInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkSemaphoreCreateFlags flags; - }; - const Unique semaphore (createSemaphore(vk, device, &semaphoreInfo, DE_NULL)); + const Unique semaphore (createSemaphore(vk, device)); const VkPipelineStageFlags stageBits[] = { VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT }; const VkSubmitInfo submitInfo[] = { @@ -420,8 +414,8 @@ public: const UniquePtr readOp (m_readOp.build(*m_opContext, *resource)); const Move cmdPool[] = { - makeCommandPool(vk, device, queuePairs[pairNdx].familyIndexWrite), - makeCommandPool(vk, device, queuePairs[pairNdx].familyIndexRead) + createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queuePairs[pairNdx].familyIndexWrite), + createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queuePairs[pairNdx].familyIndexRead) }; const Move ptrCmdBuffer[] = { diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp index 8728c72..0983aa7 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp @@ -78,9 +78,9 @@ public: const VkDevice device = m_context.getDevice(); const VkQueue queue = m_context.getUniversalQueue(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); - const Unique event (makeEvent(vk, device)); + const Unique event (createEvent(vk, device)); const SyncInfo writeSync = m_writeOp->getSyncInfo(); const SyncInfo readSync = m_readOp->getSyncInfo(); @@ -133,7 +133,7 @@ public: const VkDevice device = m_context.getDevice(); const VkQueue queue = m_context.getUniversalQueue(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move cmdBuffer (makeCommandBuffer(vk, device, *cmdPool)); const SyncInfo writeSync = m_writeOp->getSyncInfo(); const SyncInfo readSync = m_readOp->getSyncInfo(); @@ -188,14 +188,8 @@ public: const VkDevice device = m_context.getDevice(); const VkQueue queue = m_context.getUniversalQueue(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - const VkSemaphoreCreateInfo semaphoreInfo = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, //VkStructureType sType; - DE_NULL, //const void* pNext; - 0u //VkSemaphoreCreateFlags flags; - }; - const Unique semaphore (createSemaphore (vk, device, &semaphoreInfo, DE_NULL)); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique semaphore (createSemaphore (vk, device)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move ptrCmdBuffer[COUNT] = {makeCommandBuffer(vk, device, *cmdPool), makeCommandBuffer(vk, device, *cmdPool)}; VkCommandBuffer cmdBuffers[COUNT] = {*ptrCmdBuffer[WRITE], *ptrCmdBuffer[READ]}; const VkPipelineStageFlags stageBits[] = { VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT }; @@ -276,7 +270,7 @@ public: const VkDevice device = m_context.getDevice(); const VkQueue queue = m_context.getUniversalQueue(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); - const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Move ptrCmdBuffer[COUNT] = {makeCommandBuffer(vk, device, *cmdPool), makeCommandBuffer(vk, device, *cmdPool)}; VkCommandBuffer cmdBuffers[COUNT] = {*ptrCmdBuffer[WRITE], *ptrCmdBuffer[READ]}; const SyncInfo writeSync = m_writeOp->getSyncInfo(); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp index 93f5d36..4bc8ed0 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp @@ -402,17 +402,10 @@ void createVertexInfo (const vector& vertexDesc, vector* commandBufferRef, vk::Move* commandPoolRef) { vk::Move commandPool; - VkCommandPoolCreateInfo commandPoolInfo; VkCommandBufferAllocateInfo commandBufferInfo; VkCommandBuffer commandBuffer; - deMemset(&commandPoolInfo, 0xcd, sizeof(commandPoolInfo)); - commandPoolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - commandPoolInfo.pNext = DE_NULL; - commandPoolInfo.flags = 0; - commandPoolInfo.queueFamilyIndex = queueFamilyNdx; - - commandPool = createCommandPool(deviceInterface, device, &commandPoolInfo, DE_NULL); + commandPool = createCommandPool(deviceInterface, device, 0u, queueFamilyNdx); deMemset(&commandBufferInfo, 0xcd, sizeof(commandBufferInfo)); commandBufferInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; @@ -1107,19 +1100,6 @@ tcu::TestStatus testFences (Context& context) return TestStatus::pass("synchronization-fences passed"); } -vk::refdetails::Checked createSemaphore (const DeviceInterface& deviceInterface, const VkDevice& device, const VkAllocationCallbacks* allocationCallbacks) -{ - VkSemaphoreCreateInfo semaCreateInfo; - VkSemaphore semaphore; - - semaCreateInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - semaCreateInfo.pNext = DE_NULL; - semaCreateInfo.flags = 0; - VK_CHECK(deviceInterface.createSemaphore(device, &semaCreateInfo, allocationCallbacks, &semaphore)); - - return vk::check(semaphore); -} - tcu::TestStatus testSemaphores (Context& context) { TestLog& log = context.getTestContext().getLog(); @@ -1131,19 +1111,20 @@ tcu::TestStatus testSemaphores (Context& context) SimpleAllocator allocator (deviceInterface, *device, getPhysicalDeviceMemoryProperties(instanceInterface, physicalDevice)); - VkQueue queue[2]; + const VkQueue queue[2] = + { + getDeviceQueue(deviceInterface, *device, queueFamilyIdx, 0), + getDeviceQueue(deviceInterface, *device, queueFamilyIdx, 1) + }; VkResult testStatus; TestContext testContext1 (deviceInterface, device.get(), queueFamilyIdx, context.getBinaryCollection(), allocator); TestContext testContext2 (deviceInterface, device.get(), queueFamilyIdx, context.getBinaryCollection(), allocator); - Unique semaphore (createSemaphore(deviceInterface, device.get(), (VkAllocationCallbacks*)DE_NULL), Deleter(deviceInterface, device.get(), DE_NULL)); + Unique semaphore (createSemaphore(deviceInterface, *device)); VkSubmitInfo submitInfo[2]; VkMappedMemoryRange range; void* resultImage; const VkPipelineStageFlags waitDstStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; - deviceInterface.getDeviceQueue(device.get(), queueFamilyIdx, 0, &queue[0]); - deviceInterface.getDeviceQueue(device.get(), queueFamilyIdx, 1, &queue[1]); - const tcu::Vec4 vertices1[] = { tcu::Vec4( 0.5f, 0.5f, 0.0f, 1.0f), @@ -1243,19 +1224,6 @@ tcu::TestStatus testSemaphores (Context& context) return tcu::TestStatus::pass("synchronization-semaphores passed"); } -vk::refdetails::Checked createEvent (const DeviceInterface& deviceInterface, const VkDevice& device, const VkAllocationCallbacks* allocationCallbacks) -{ - VkEventCreateInfo eventCreateInfo; - VkEvent event; - - eventCreateInfo.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO; - eventCreateInfo.pNext = DE_NULL; - eventCreateInfo.flags = 0; - VK_CHECK(deviceInterface.createEvent(device, &eventCreateInfo, allocationCallbacks, &event)); - - return vk::check(event); -} - tcu::TestStatus testEvents (Context& context) { TestLog& log = context.getTestContext().getLog(); @@ -1267,7 +1235,7 @@ tcu::TestStatus testEvents (Context& context) VkResult testStatus; VkResult eventStatus; TestContext testContext (deviceInterface, device, queueFamilyIdx, context.getBinaryCollection(), allocator); - Unique event (createEvent(deviceInterface, device, (VkAllocationCallbacks*)DE_NULL), Deleter(deviceInterface, device, DE_NULL)); + Unique event (createEvent(deviceInterface, device)); VkSubmitInfo submitInfo; VkMappedMemoryRange range; void* resultImage; diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp index ecfab5a..577cb5e 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp @@ -105,18 +105,6 @@ VkImageMemoryBarrier makeImageMemoryBarrier (const VkAccessFlags srcAccessMask return barrier; } -Move makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex, // deUint32 queueFamilyIndex; - }; - return createCommandPool(vk, device, &info); -} - Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) { const VkCommandBufferAllocateInfo info = @@ -277,17 +265,6 @@ VkBufferImageCopy makeBufferImageCopy (const VkImageSubresourceLayers subresourc return copyParams; } -Move makeEvent (const DeviceInterface& vk, const VkDevice device) -{ - const VkEventCreateInfo eventParams = - { - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkEventCreateFlags)0, // VkEventCreateFlags flags; - }; - return createEvent(vk, device, &eventParams); -} - void beginCommandBuffer (const DeviceInterface& vk, const VkCommandBuffer commandBuffer) { const VkCommandBufferBeginInfo info = @@ -310,13 +287,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceInfo)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp index 79e352d..4679d8f 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp @@ -213,7 +213,6 @@ struct ImageResource vk::VkBufferCreateInfo makeBufferCreateInfo (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage); vk::VkImageCreateInfo makeImageCreateInfo (const vk::VkImageType imageType, const vk::VkExtent3D& extent, const vk::VkFormat format, const vk::VkImageUsageFlags usage); -vk::Move makeCommandPool (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex); vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool); vk::Move makeDescriptorSet (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout); @@ -224,7 +223,6 @@ vk::Move makeRenderPassWithoutAttachments (const vk::Device vk::Move makeFramebuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass, const vk::VkImageView colorAttachment, const deUint32 width, const deUint32 height, const deUint32 layers); vk::Move makeFramebufferWithoutAttachments (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass); vk::Move makeImageView (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkImage image, const vk::VkImageViewType viewType, const vk::VkFormat format, const vk::VkImageSubresourceRange subresourceRange); -vk::Move makeEvent (const vk::DeviceInterface& vk, const vk::VkDevice device); vk::VkBufferImageCopy makeBufferImageCopy (const vk::VkImageSubresourceLayers subresourceLayers, const vk::VkExtent3D extent); vk::VkMemoryBarrier makeMemoryBarrier (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask); vk::VkBufferMemoryBarrier makeBufferMemoryBarrier (const vk::VkAccessFlags srcAccessMask, const vk::VkAccessFlags dstAccessMask, const vk::VkBuffer buffer, const vk::VkDeviceSize offset, const vk::VkDeviceSize bufferSizeBytes); diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp index a2bfc8f..938d19d 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp @@ -365,7 +365,7 @@ tcu::TestStatus test (Context& context, const CaseDefinition caseDef) const Unique renderPass (makeRenderPass (vk, device, colorFormat)); const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipelineLayout (makePipelineLayoutWithoutDescriptors(vk, device)); const int inPatchSize = (caseDef.primitiveType == TESSPRIMITIVETYPE_TRIANGLES ? 3 : 4); diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp index 944b9a8..05d3267 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp @@ -527,11 +527,11 @@ tcu::TestStatus TessCoordTestInstance::iterate (void) // Pipeline: set up vertex processing without rasterization - const Unique renderPass (makeRenderPassWithoutAttachments (vk, device)); - const Unique framebuffer (makeFramebufferWithoutAttachments(vk, device, *renderPass)); - const Unique pipelineLayout(makePipelineLayout (vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique renderPass (makeRenderPassWithoutAttachments (vk, device)); + const Unique framebuffer (makeFramebufferWithoutAttachments(vk, device, *renderPass)); + const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); + const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setShader(vk, device, VK_SHADER_STAGE_VERTEX_BIT, m_context.getBinaryCollection().get("vert"), DE_NULL) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp index b3f9392..d619339 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp @@ -478,7 +478,7 @@ tcu::TestStatus test (Context& context, const SpacingMode spacingMode) const Unique framebuffer (makeFramebufferWithoutAttachments(vk, device, *renderPass)); const Unique pipelineLayout(makePipelineLayout (vk, device, *descriptorSetLayout)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setShader(vk, device, VK_SHADER_STAGE_VERTEX_BIT, context.getBinaryCollection().get("vert"), DE_NULL) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryGridRenderTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryGridRenderTests.cpp index d7bd3a1..09c54ad 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryGridRenderTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryGridRenderTests.cpp @@ -556,7 +556,7 @@ tcu::TestStatus GridRenderTestInstance::iterate (void) const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), m_params.numLayers)); const Unique pipelineLayout (makePipelineLayoutWithoutDescriptors(vk, device)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline (GraphicsPipelineBuilder() .setRenderSize (renderSize) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPassthroughTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPassthroughTests.cpp index 37bc882..7088271 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPassthroughTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPassthroughTests.cpp @@ -485,12 +485,12 @@ tcu::TestStatus PassthroughTestInstance::iterate (void) // Pipeline - const Unique colorAttachmentView(makeImageView (vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); - const Unique renderPass (makeRenderPass (vk, device, colorFormat)); - const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); - const Unique pipelineLayout (makePipelineLayout (vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique colorAttachmentView(makeImageView(vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); + const Unique renderPass (makeRenderPass(vk, device, colorFormat)); + const Unique framebuffer (makeFramebuffer(vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); + const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); + const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); // Message explaining the test { diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPointSizeTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPointSizeTests.cpp index 5115362..b812f3a 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPointSizeTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPointSizeTests.cpp @@ -331,7 +331,7 @@ tcu::TestStatus test (Context& context, const Flags flags) const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); const Unique pipelineLayout (makePipelineLayoutWithoutDescriptors(vk, device)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); GraphicsPipelineBuilder pipelineBuilder; diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp index 4479d0a..471b602 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp @@ -607,7 +607,7 @@ BaseTestInstance::BaseTestInstance (Context& context, const CaseDefinition caseD , m_framebuffer (makeFramebufferWithoutAttachments(m_context.getDeviceInterface(), m_context.getDevice(), *m_renderPass)) , m_pipelineLayout (makePipelineLayout (m_context.getDeviceInterface(), m_context.getDevice(), *m_descriptorSetLayout)) , m_cmdPool (makeCommandPool (m_context.getDeviceInterface(), m_context.getDevice(), m_context.getUniversalQueueFamilyIndex())) - , m_cmdBuffer (makeCommandBuffer (m_context.getDeviceInterface(), m_context.getDevice(), *m_cmdPool)) + , m_cmdBuffer (allocateCommandBuffer (m_context.getDeviceInterface(), m_context.getDevice(), *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)) { requireFeatures(context.getInstanceInterface(), context.getPhysicalDevice(), FEATURE_TESSELLATION_SHADER | FEATURE_GEOMETRY_SHADER | FEATURE_VERTEX_PIPELINE_STORES_AND_ATOMICS); @@ -1385,7 +1385,7 @@ tcu::TestStatus InvarianceTestInstance::iterate (void) const Unique framebuffer (makeFramebufferWithoutAttachments(vk, device, *renderPass)); const Unique pipelineLayout(makePipelineLayout (vk, device, *descriptorSetLayout)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); for (int tessLevelCaseNdx = 0; tessLevelCaseNdx < static_cast(tessLevelCases.size()); ++tessLevelCaseNdx) { @@ -2035,7 +2035,7 @@ tcu::TestStatus test (Context& context, const CaseDefinition caseDef) const Unique framebuffer (makeFramebufferWithoutAttachments(vk, device, *renderPass)); const Unique pipelineLayout(makePipelineLayout (vk, device, *descriptorSetLayout)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setPatchControlPoints (NUM_TESS_LEVELS) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationMiscDrawTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationMiscDrawTests.cpp index 5aa95d4..69c98c0 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationMiscDrawTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationMiscDrawTests.cpp @@ -195,12 +195,12 @@ tcu::TestStatus runTest (Context& context, const CaseDefinition caseDef) // Pipeline - const Unique colorAttachmentView (makeImageView (vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); - const Unique renderPass (makeRenderPass (vk, device, colorFormat)); - const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); - const Unique pipelineLayout (makePipelineLayout (vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique colorAttachmentView (makeImageView(vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); + const Unique renderPass (makeRenderPass(vk, device, colorFormat)); + const Unique framebuffer (makeFramebuffer(vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); + const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); + const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setRenderSize (renderSize) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp index bd77bbf..950defa 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp @@ -462,13 +462,13 @@ tcu::TestStatus test (Context& context, const CaseDefinition caseDef) // Pipeline - const Unique colorAttachmentView(makeImageView (vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); - const Unique renderPass (makeRenderPass (vk, device, colorFormat)); - const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); - const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); - const bool needPointSizeWrite = getPhysicalDeviceFeatures(context.getInstanceInterface(), context.getPhysicalDevice()).shaderTessellationAndGeometryPointSize && caseDef.usePointMode; + const Unique colorAttachmentView (makeImageView(vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); + const Unique renderPass (makeRenderPass(vk, device, colorFormat)); + const Unique framebuffer (makeFramebuffer(vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); + const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); + const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); + const bool needPointSizeWrite = getPhysicalDeviceFeatures(context.getInstanceInterface(), context.getPhysicalDevice()).shaderTessellationAndGeometryPointSize && caseDef.usePointMode; const Unique pipeline(GraphicsPipelineBuilder() .setRenderSize (renderSize) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationShaderInputOutputTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationShaderInputOutputTests.cpp index a7ad3a5..686b45c 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationShaderInputOutputTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationShaderInputOutputTests.cpp @@ -111,7 +111,7 @@ tcu::TestStatus runTest (Context& context, const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); const Unique pipelineLayout (makePipelineLayoutWithoutDescriptors(vk, device)); const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setRenderSize (renderSize) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp index 5a053ea..826051b 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp @@ -825,12 +825,12 @@ tcu::TestStatus UserDefinedIOTestInstance::iterate (void) // Pipeline - const Unique colorAttachmentView(makeImageView (vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); - const Unique renderPass (makeRenderPass (vk, device, colorFormat)); - const Unique framebuffer (makeFramebuffer (vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); + const Unique colorAttachmentView(makeImageView(vk, device, *colorAttachmentImage, VK_IMAGE_VIEW_TYPE_2D, colorFormat, colorImageSubresourceRange)); + const Unique renderPass (makeRenderPass(vk, device, colorFormat)); + const Unique framebuffer (makeFramebuffer(vk, device, *renderPass, *colorAttachmentView, renderSize.x(), renderSize.y(), 1u)); const Unique pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer (makeCommandBuffer (vk, device, *cmdPool)); + const Unique cmdPool (makeCommandPool(vk, device, queueFamilyIndex)); + const Unique cmdBuffer (allocateCommandBuffer (vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); const Unique pipeline(GraphicsPipelineBuilder() .setRenderSize (renderSize) diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp index 58f6c96..687795f 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp @@ -106,18 +106,6 @@ Move makeCommandPool (const DeviceInterface& vk, const VkDevice d return createCommandPool(vk, device, &info); } -Move makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool) -{ - const VkCommandBufferAllocateInfo info = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1u, // deUint32 commandBufferCount; - }; - return allocateCommandBuffer(vk, device, &info); -} Move makeDescriptorSet (const DeviceInterface& vk, const VkDevice device, @@ -278,13 +266,7 @@ void submitCommandsAndWait (const DeviceInterface& vk, const VkQueue queue, const VkCommandBuffer commandBuffer) { - const VkFenceCreateInfo fenceInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - (VkFenceCreateFlags)0, // VkFenceCreateFlags flags; - }; - const Unique fence(createFence(vk, device, &fenceInfo)); + const Unique fence(createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.hpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.hpp index 552e2f5..ce120fe 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.hpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.hpp @@ -195,7 +195,6 @@ typedef deUint32 FeatureFlags; vk::VkBufferCreateInfo makeBufferCreateInfo (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage); vk::VkImageCreateInfo makeImageCreateInfo (const tcu::IVec2& size, const vk::VkFormat format, const vk::VkImageUsageFlags usage, const deUint32 numArrayLayers); vk::Move makeCommandPool (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex); -vk::Move makeCommandBuffer (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool); vk::Move makeDescriptorSet (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); vk::Move makePipelineLayout (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout); vk::Move makePipelineLayoutWithoutDescriptors (const vk::DeviceInterface& vk, const vk::VkDevice device); diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp index d61bc07..ddf56c9 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp @@ -322,7 +322,7 @@ tcu::TestStatus WindingTestInstance::iterate (void) // Draw commands const Unique cmdPool (makeCommandPool (vk, device, queueFamilyIndex)); - const Unique cmdBuffer(makeCommandBuffer(vk, device, *cmdPool)); + const Unique cmdBuffer(allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); for (int caseNdx = 0; caseNdx < DE_LENGTH_OF_ARRAY(testCases); ++caseNdx) { diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp index fd080d3..abd1b48 100644 --- a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp +++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp @@ -357,26 +357,9 @@ void initializeImage(Context& ctx, VkImage im, const ConstPixelBufferAccess* pba de::UniquePtr bufMem(ctx.getDefaultAllocator().allocate(bufMemReq, MemoryRequirement::HostVisible)); VK_CHECK(vkd.bindBufferMemory(dev, buf.get(), bufMem->getMemory(), bufMem->getOffset())); - const VkCommandPoolCreateInfo copyPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, - DE_NULL, - VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, - uqfi - }; - - Unique copyPool(createCommandPool(vkd, dev, ©PoolCreateInfo)); - - const VkCommandBufferAllocateInfo copyBufferCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - copyPool.get(), - VK_COMMAND_BUFFER_LEVEL_PRIMARY, - 1 - }; + Unique copyPool(createCommandPool(vkd, dev, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, uqfi)); - Unique copyBuffer(allocateCommandBuffer(vkd, dev, ©BufferCreateInfo)); + Unique copyBuffer(allocateCommandBuffer(vkd, dev, *copyPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); std::vector copyRegions; diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp index 124b1c7..d933926 100644 --- a/external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp +++ b/external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp @@ -429,17 +429,7 @@ TextureRenderer::TextureRenderer (Context& context, VkSampleCountFlagBits sample Allocator& allocator = m_context.getDefaultAllocator(); // Command Pool - { - const VkCommandPoolCreateInfo cmdPoolCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // VkCommandPoolCreateFlags flags; - queueFamilyIndex // deUint32 queueFamilyIndex; - }; - - m_commandPool = createCommandPool(vkd, vkDevice, &cmdPoolCreateInfo, DE_NULL); - } + m_commandPool = createCommandPool(vkd, vkDevice, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); // Image { @@ -725,16 +715,7 @@ TextureRenderer::TextureRenderer (Context& context, VkSampleCountFlagBits sample } // Fence - { - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - VK_FENCE_CREATE_SIGNALED_BIT // VkFenceCreateFlags flags; - }; - - m_fence = createFence(vkd, vkDevice, &fenceParams); - } + m_fence = createFence(vkd, vkDevice); // Result Buffer { @@ -781,16 +762,7 @@ void TextureRenderer::clearImage(VkImage image) 1 // deUint32 layerCount; }; - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1 // deUint32 commandBufferCount; - }; - - commandBuffer = allocateCommandBuffer(vkd, vkDevice, &cmdBufferAllocateInfo); + commandBuffer = allocateCommandBuffer(vkd, vkDevice, *m_commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); const VkCommandBufferBeginInfo cmdBufferBeginInfo = { @@ -1451,18 +1423,7 @@ void TextureRenderer::renderQuad (tcu::Surface& result, } // Create Command Buffer - { - const VkCommandBufferAllocateInfo cmdBufferAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - *m_commandPool, // VkCommandPool commandPool; - VK_COMMAND_BUFFER_LEVEL_PRIMARY, // VkCommandBufferLevel level; - 1 // deUint32 commandBufferCount; - }; - - commandBuffer = allocateCommandBuffer(vkd, vkDevice, &cmdBufferAllocateInfo); - } + commandBuffer = allocateCommandBuffer(vkd, vkDevice, *m_commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); // Begin Command Buffer { diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp index a9ee588..3551132 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp @@ -1508,33 +1508,16 @@ Move createPipelineLayout (Context& context, vk::VkDescrip Move createCmdPool (Context& context) { - const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const vk::VkCommandPoolCreateInfo params = - { - vk::VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType - DE_NULL, // pNext - vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // flags - queueFamilyIndex, // queueFamilyIndex - }; + const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - return vk::createCommandPool(context.getDeviceInterface(), context.getDevice(), ¶ms); + return vk::createCommandPool(context.getDeviceInterface(), context.getDevice(), vk::VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex); } Move createCmdBuffer (Context& context, vk::VkCommandPool cmdPool) { - const vk::VkCommandBufferAllocateInfo params = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType - DE_NULL, // pNext - cmdPool, // commandPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // bufferCount - }; - - return vk::allocateCommandBuffer(context.getDeviceInterface(), context.getDevice(), ¶ms); + return vk::allocateCommandBuffer(context.getDeviceInterface(), context.getDevice(), cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); } - // UniformBlockCaseInstance class UniformBlockCaseInstance : public vkt::TestInstance @@ -1856,13 +1839,7 @@ tcu::TestStatus UniformBlockCaseInstance::iterate (void) // Submit the command buffer { - const vk::VkFenceCreateInfo fenceParams = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0u, // VkFenceCreateFlags flags; - }; - const Unique fence(vk::createFence(vk, device, &fenceParams)); + const Unique fence(vk::createFence(vk, device)); const VkSubmitInfo submitInfo = { diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp index a53701c..c05c558 100644 --- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp +++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp @@ -152,19 +152,6 @@ BoolOp boolOpFromIndex (size_t index) return ops[index % DE_LENGTH_OF_ARRAY(ops)]; } -// Utility functions using flattened structs -Move createFence (const DeviceInterface& vk, VkDevice device, VkFenceCreateFlags flags) -{ - const VkFenceCreateInfo pCreateInfo = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - - flags - }; - return createFence(vk, device, &pCreateInfo); -} - Move createFramebuffer (const DeviceInterface& vk, VkDevice device, VkFramebufferCreateFlags pCreateInfo_flags, @@ -283,21 +270,6 @@ Move createBuffer (const DeviceInterface& vk, return createBuffer(vk, device, &pCreateInfo); } -Move createCommandPool (const DeviceInterface& vk, - VkDevice device, - VkCommandPoolCreateFlags pCreateInfo_flags, - deUint32 pCreateInfo_queueFamilyIndex) -{ - const VkCommandPoolCreateInfo pCreateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, - DE_NULL, - pCreateInfo_flags, - pCreateInfo_queueFamilyIndex, - }; - return createCommandPool(vk, device, &pCreateInfo); -} - void cmdBeginRenderPass (const DeviceInterface& vk, VkCommandBuffer cmdBuffer, VkRenderPass pRenderPassBegin_renderPass, @@ -320,22 +292,6 @@ void cmdBeginRenderPass (const DeviceInterface& vk, vk.cmdBeginRenderPass(cmdBuffer, &pRenderPassBegin, contents); } -Move allocateCommandBuffer (const DeviceInterface& vk, - VkDevice device, - VkCommandPool pCreateInfo_commandPool, - VkCommandBufferLevel pCreateInfo_level) -{ - const VkCommandBufferAllocateInfo pAllocateInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - pCreateInfo_commandPool, - pCreateInfo_level, - 1u, // bufferCount - }; - return allocateCommandBuffer(vk, device, &pAllocateInfo); -} - void beginCommandBuffer (const DeviceInterface& vk, VkCommandBuffer cmdBuffer, VkCommandBufferUsageFlags pBeginInfo_flags, diff --git a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp index 83e964f..15ca3b1 100644 --- a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp +++ b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp @@ -1240,15 +1240,8 @@ Move createFramebuffer (Context& context, vk::VkRenderPass re Move createCommandPool (Context& context) { const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex(); - const vk::VkCommandPoolCreateInfo params = - { - vk::VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType - DE_NULL, // pNext - (vk::VkCommandPoolCreateFlags)0, - queueFamilyIndex, // queueFamilyIndex - }; - return vk::createCommandPool(context.getDeviceInterface(), context.getDevice(), ¶ms); + return vk::createCommandPool(context.getDeviceInterface(), context.getDevice(), (vk::VkCommandPoolCreateFlags)0u, queueFamilyIndex); } Move createDescriptorPool (Context& context) @@ -1274,16 +1267,7 @@ Move allocateDescriptorSet (Context& context, vk::VkDescrip Move allocateCommandBuffer (Context& context, vk::VkCommandPool cmdPool) { - const vk::VkCommandBufferAllocateInfo params = - { - vk::VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType - DE_NULL, // pNext - cmdPool, // commandPool - vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level - 1u, // bufferCount - }; - - return vk::allocateCommandBuffer(context.getDeviceInterface(), context.getDevice(), ¶ms); + return vk::allocateCommandBuffer(context.getDeviceInterface(), context.getDevice(), cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_PRIMARY); } MovePtr allocateAndBindMemory (Context& context, vk::VkBuffer buffer, vk::MemoryRequirement memReqs) @@ -1683,13 +1667,7 @@ TestStatus ShaderCaseInstance::iterate (void) 0u, // signalSemaphoreCount (const vk::VkSemaphore*)0, // pSignalSemaphores }; - const vk::VkFenceCreateInfo fenceParams = - { - vk::VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType - DE_NULL, // pNext - 0u, // flags - }; - const Unique fence (vk::createFence(vkd, device, &fenceParams)); + const Unique fence (vk::createFence(vkd, device)); VK_CHECK(vkd.queueSubmit (queue, 1u, &submitInfo, *fence)); VK_CHECK(vkd.waitForFences (device, 1u, &fence.get(), DE_TRUE, ~0ull)); diff --git a/external/vulkancts/modules/vulkan/vktTestCase.cpp b/external/vulkancts/modules/vulkan/vktTestCase.cpp index 72024c9..8b8c8ec 100644 --- a/external/vulkancts/modules/vulkan/vktTestCase.cpp +++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp @@ -250,9 +250,7 @@ DefaultDevice::~DefaultDevice (void) VkQueue DefaultDevice::getUniversalQueue (void) const { - VkQueue queue = 0; - m_deviceInterface.getDeviceQueue(*m_device, m_universalQueueFamilyIndex, 0, &queue); - return queue; + return getDeviceQueue(m_deviceInterface, *m_device, m_universalQueueFamilyIndex, 0); } VkPhysicalDeviceFeatures DefaultDevice::filterDefaultDeviceFeatures (const VkPhysicalDeviceFeatures& deviceFeatures) diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp index 1d78145..7fa7eed 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp @@ -201,13 +201,6 @@ struct InstanceHelper {} }; -VkQueue getDeviceQueue (const DeviceInterface& vkd, VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex) -{ - VkQueue queue = (VkQueue)0; - vkd.getDeviceQueue(device, queueFamilyIndex, queueIndex, &queue); - return queue; -} - struct DeviceHelper { const VkPhysicalDevice physicalDevice; @@ -1294,18 +1287,6 @@ typedef de::SharedPtr > CommandBufferSp; typedef de::SharedPtr > FenceSp; typedef de::SharedPtr > SemaphoreSp; -Move createFence (const DeviceInterface& vkd, - const VkDevice device) -{ - const VkFenceCreateInfo fenceParams = - { - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - DE_NULL, - (VkFenceCreateFlags)0, - }; - return vk::createFence(vkd, device, &fenceParams); -} - vector createFences (const DeviceInterface& vkd, const VkDevice device, size_t numFences) @@ -1318,18 +1299,6 @@ vector createFences (const DeviceInterface& vkd, return fences; } -Move createSemaphore (const DeviceInterface& vkd, - const VkDevice device) -{ - const VkSemaphoreCreateInfo semaphoreParams = - { - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, - DE_NULL, - (VkSemaphoreCreateFlags)0, - }; - return vk::createSemaphore(vkd, device, &semaphoreParams); -} - vector createSemaphores (const DeviceInterface& vkd, const VkDevice device, size_t numSemaphores) @@ -1342,41 +1311,16 @@ vector createSemaphores (const DeviceInterface& vkd, return semaphores; } -Move createCommandPool (const DeviceInterface& vkd, - const VkDevice device, - VkCommandPoolCreateFlags flags, - deUint32 queueFamilyIndex) -{ - const VkCommandPoolCreateInfo commandPoolParams = - { - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, - DE_NULL, - flags, - queueFamilyIndex - }; - - return createCommandPool(vkd, device, &commandPoolParams); -} - vector allocateCommandBuffers (const DeviceInterface& vkd, const VkDevice device, const VkCommandPool commandPool, const VkCommandBufferLevel level, const size_t numCommandBuffers) { - const VkCommandBufferAllocateInfo allocInfo = - { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, - DE_NULL, - commandPool, - level, - 1u, - }; - vector buffers (numCommandBuffers); for (size_t ndx = 0; ndx < numCommandBuffers; ++ndx) - buffers[ndx] = CommandBufferSp(new Unique(allocateCommandBuffer(vkd, device, &allocInfo))); + buffers[ndx] = CommandBufferSp(new Unique(allocateCommandBuffer(vkd, device, commandPool, level))); return buffers; } -- 2.7.4