Factor out copies of makeBufferCreateInfo
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Thu, 21 Mar 2019 14:18:37 +0000 (14:18 +0000)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Thu, 9 May 2019 07:53:26 +0000 (03:53 -0400)
Components: Vulkan
Change-Id: I1a81b8fbc19faa41c367834e3233cf96cccbc05e

31 files changed:
external/vulkancts/framework/vulkan/CMakeLists.txt
external/vulkancts/framework/vulkan/vkObjUtil.cpp
external/vulkancts/framework/vulkan/vkObjUtil.hpp
external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp
external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp
external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDispatchTests.cpp
external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalRenderingTestUtil.hpp
external/vulkancts/modules/vulkan/draw/vktDrawShaderLayerTests.cpp
external/vulkancts/modules/vulkan/draw/vktDrawShaderViewportIndexTests.cpp
external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp
external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.hpp
external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp
external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.hpp
external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp
external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp
external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.hpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.hpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.hpp
external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp
external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.hpp
external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp
external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp

index 82f985c..d713f91 100644 (file)
@@ -57,8 +57,6 @@ set(VKUTILNOSHADER_SRCS
        vkBufferWithMemory.hpp
        vkImageWithMemory.cpp
        vkImageWithMemory.hpp
-       vkBufferWithMemory.cpp
-       vkBufferWithMemory.hpp
        vkImageWithMemory.cpp
        vkImageWithMemory.hpp
        vkShaderProgram.cpp
index c39bb48..f8cadb8 100644 (file)
@@ -528,4 +528,21 @@ Move<VkDescriptorSet> makeDescriptorSet (const DeviceInterface&                    vk,
        return allocateDescriptorSet(vk, device, &allocateParams);
 }
 
+VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    size,
+                                                                                const VkBufferUsageFlags       usage)
+{
+       const VkBufferCreateInfo bufferCreateInfo =
+       {
+               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
+               DE_NULL,                                                                // const void*                  pNext;
+               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
+               size,                                                                   // VkDeviceSize                 size;
+               usage,                                                                  // VkBufferUsageFlags   usage;
+               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
+               0u,                                                                             // deUint32                             queueFamilyIndexCount;
+               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
+       };
+       return bufferCreateInfo;
+}
+
 } // vk
index d34bfbd..2c65630 100644 (file)
@@ -102,6 +102,9 @@ Move<VkDescriptorSet> makeDescriptorSet (const DeviceInterface&                     vk,
                                                                                 const VkDescriptorSetLayout    setLayout,
                                                                                 const void*                                    pNext = DE_NULL);
 
+VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    size,
+                                                                                const VkBufferUsageFlags       usage);
+
 } // vk
 
 #endif // _VKOBJUTIL_HPP
index bbe4557..bb1ca16 100644 (file)
@@ -767,22 +767,6 @@ TestInstance* DescriptorSetRandomTestCase::createInstance (Context& context) con
        return new DescriptorSetRandomTestInstance(context, m_data);
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
 VkBufferImageCopy makeBufferImageCopy (const VkExtent3D                                        extent,
                                                                           const VkImageSubresourceLayers       subresourceLayers)
 {
index 446861a..538fd57 100644 (file)
@@ -223,7 +223,7 @@ tcu::TestStatus IndirectDispatchInstanceBufferUpload::iterate (void)
 
        Buffer resultBuffer(
                m_device_interface, m_device, m_allocator,
-               makeBufferCreateInfo(resultBufferSize, vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
+               vk::makeBufferCreateInfo(resultBufferSize, vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
                vk::MemoryRequirement::HostVisible);
 
        {
@@ -275,7 +275,7 @@ tcu::TestStatus IndirectDispatchInstanceBufferUpload::iterate (void)
        // Create indirect buffer
        Buffer indirectBuffer(
                m_device_interface, m_device, m_allocator,
-               makeBufferCreateInfo(m_bufferSize, vk::VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
+               vk::makeBufferCreateInfo(m_bufferSize, vk::VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
                vk::MemoryRequirement::HostVisible);
        fillIndirectBufferData(*cmdBuffer, indirectBuffer);
 
index 7104205..49c8a4f 100644 (file)
@@ -54,23 +54,6 @@ Image::Image (const DeviceInterface& vk,
        VK_CHECK(vk.bindImageMemory(device, *m_image, m_allocation->getMemory(), m_allocation->getOffset()));
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               0u,                                                                             // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkBufferImageCopy makeBufferImageCopy (const VkExtent3D extent,
                                                                           const deUint32       arraySize)
 {
index 90982c2..0bb5704 100644 (file)
@@ -30,6 +30,7 @@
 #include "vkPrograms.hpp"
 #include "vkTypeUtil.hpp"
 #include "vkImageUtil.hpp"
+#include "vkObjUtil.hpp"
 
 namespace vkt
 {
@@ -101,9 +102,6 @@ vk::Move<vk::VkPipeline>            makeComputePipeline                             (const vk::DeviceInterface&
                                                                                                                                 const vk::VkShaderModule                                       shaderModule,
                                                                                                                                 const vk::VkPipelineShaderStageCreateFlags     shaderFlags);
 
-vk::VkBufferCreateInfo                 makeBufferCreateInfo                    (const vk::VkDeviceSize                                         bufferSize,
-                                                                                                                                const vk::VkBufferUsageFlags                           usage);
-
 vk::VkBufferImageCopy                  makeBufferImageCopy                             (const vk::VkExtent3D                                           extent,
                                                                                                                                 const deUint32                                                         arraySize);
 
index b92b0de..53ed290 100644 (file)
@@ -180,7 +180,7 @@ tcu::TestStatus ConditionalDispatchTestInstance::iterate (void)
        // Create a buffer and host-visible memory for it
 
        const vk::VkDeviceSize bufferSizeBytes = sizeof(deUint32);
-       const compute::Buffer outputBuffer(vk, device, allocator, compute::makeBufferCreateInfo(bufferSizeBytes, vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT), vk::MemoryRequirement::HostVisible);
+       const compute::Buffer outputBuffer(vk, device, allocator, vk::makeBufferCreateInfo(bufferSizeBytes, vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT), vk::MemoryRequirement::HostVisible);
 
        {
                const vk::Allocation& alloc = outputBuffer.getAllocation();
@@ -223,7 +223,7 @@ tcu::TestStatus ConditionalDispatchTestInstance::iterate (void)
 
        compute::Buffer indirectBuffer(
                vk, device, allocator,
-               compute::makeBufferCreateInfo(sizeof(dispatchCommands), vk::VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
+               vk::makeBufferCreateInfo(sizeof(dispatchCommands), vk::VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | vk::VK_BUFFER_USAGE_STORAGE_BUFFER_BIT),
                vk::MemoryRequirement::HostVisible);
 
        deUint8* indirectBufferPtr = reinterpret_cast<deUint8*>(indirectBuffer.getAllocation().getHostPtr());
index 07faf80..45e3739 100644 (file)
@@ -25,6 +25,7 @@
  *//*--------------------------------------------------------------------*/
 
 #include "vkDefs.hpp"
+#include "vkObjUtil.hpp"
 #include "vktDrawBufferObjectUtil.hpp"
 #include "vktTestCase.hpp"
 #include "deSharedPtr.hpp"
@@ -81,4 +82,4 @@ void                                          beginConditionalRendering                               (const vk::DeviceInterface& vk,
 } // conditional
 } // vkt
 
-#endif // _VKTCONDITIONALRENDERINGTESTUTIL_HPP
\ No newline at end of file
+#endif // _VKTCONDITIONALRENDERINGTESTUTIL_HPP
index 6c32628..8e1cd42 100644 (file)
@@ -77,23 +77,6 @@ inline VkDeviceSize sizeInBytes(const std::vector<T>& vec)
        return vec.size() * sizeof(vec[0]);
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkPipelineLayout> makePipelineLayout (const DeviceInterface&              vk,
                                                                                   const VkDevice                               device)
 {
index 4b4b7fd..4d298e1 100644 (file)
@@ -76,23 +76,6 @@ inline VkDeviceSize sizeInBytes(const std::vector<T>& vec)
        return vec.size() * sizeof(vec[0]);
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkPipelineLayout> makePipelineLayout (const DeviceInterface&              vk,
                                                                                   const VkDevice                               device)
 {
index 14aae09..39bb08a 100644 (file)
@@ -35,23 +35,6 @@ namespace FragmentOperations
 using namespace vk;
 using de::MovePtr;
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkPipelineLayout> makePipelineLayout (const DeviceInterface&              vk,
                                                                                   const VkDevice                               device)
 {
index 11642c8..bf9617a 100644 (file)
@@ -25,6 +25,7 @@
 
 #include "vkDefs.hpp"
 #include "vkRef.hpp"
+#include "vkObjUtil.hpp"
 #include "vkRefUtil.hpp"
 #include "vkMemUtil.hpp"
 #include "deUniquePtr.hpp"
@@ -35,7 +36,6 @@ namespace vkt
 namespace FragmentOperations
 {
 
-vk::VkBufferCreateInfo                 makeBufferCreateInfo    (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout              (const vk::DeviceInterface& vk, const vk::VkDevice device);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout              (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout);
 vk::Move<vk::VkPipeline>               makeComputePipeline             (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkPipelineLayout pipelineLayout, const vk::VkShaderModule shaderModule, const vk::VkSpecializationInfo* specInfo);
index 9d4982a..a74982e 100644 (file)
@@ -371,23 +371,6 @@ size_t calcOutputVertices (const VkPrimitiveTopology&  inputType)
        }
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkImageCreateInfo makeImageCreateInfo (const tcu::IVec2& size, const VkFormat format, const VkImageUsageFlags usage, const deUint32 numArrayLayers)
 {
        const VkImageCreateInfo imageInfo =
index d016b8f..fccda6a 100644 (file)
@@ -25,6 +25,7 @@
  *//*--------------------------------------------------------------------*/
 
 #include "vkDefs.hpp"
+#include "vkObjUtil.hpp"
 #include "vkMemUtil.hpp"
 #include "vkRef.hpp"
 #include "vkPrograms.hpp"
@@ -166,7 +167,6 @@ std::string                                         inputTypeToGLString                     (const vk::VkPrimitiveTopology& inputType
 std::string                                            outputTypeToGLString            (const vk::VkPrimitiveTopology& outputType);
 std::size_t                                            calcOutputVertices                      (const vk::VkPrimitiveTopology& inputType);
 
-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 = 1u);
 vk::VkBufferImageCopy                  makeBufferImageCopy                     (const vk::VkExtent3D extent, const vk::VkImageSubresourceLayers subresourceLayers);
 vk::VkBufferImageCopy                  makeBufferImageCopy                     (const vk::VkDeviceSize& bufferOffset, const vk::VkImageSubresourceLayers& imageSubresource, const vk::VkOffset3D& imageOffset, const vk::VkExtent3D& imageExtent);
index 94c505d..8bdc111 100644 (file)
@@ -192,23 +192,6 @@ deUint32 getLayerDimensions (const ImageType imageType)
        }
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               0u,                                                                             // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkBufferImageCopy makeBufferImageCopy (const VkExtent3D extent,
                                                                           const deUint32       arraySize)
 {
index dee8f6d..ebd331f 100644 (file)
@@ -138,9 +138,6 @@ vk::Move<vk::VkRenderPass>                  makeRenderPass                                  (const vk::DeviceInterface&
                                                                                                                                         const vk::VkFormat                                                     inputFormat,
                                                                                                                                         const vk::VkFormat                                                     colorFormat);
 
-vk::VkBufferCreateInfo                         makeBufferCreateInfo                    (const vk::VkDeviceSize                                         bufferSize,
-                                                                                                                                        const vk::VkBufferUsageFlags                           usage);
-
 vk::VkBufferImageCopy                          makeBufferImageCopy                             (const vk::VkExtent3D                                           extent,
                                                                                                                                         const deUint32                                                         arraySize);
 
index 36acd01..58d4f54 100644 (file)
@@ -924,23 +924,6 @@ TestInstance* MemoryModelTestCase::createInstance (Context& context) const
        return new MemoryModelTestInstance(context, m_data);
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 tcu::TestStatus MemoryModelTestInstance::iterate (void)
 {
        const DeviceInterface&  vk                                              = m_context.getDeviceInterface();
index 48beddf..3e3636a 100644 (file)
@@ -109,22 +109,6 @@ VkFormat getDepthBufferFormat (const vk::VkFormat depthStencilImageFormat)
        return result;
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize bufferSize, const VkBufferUsageFlags usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo       =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkImageCreateInfo makeImageCreateInfo (const VkImageType imageType, const VkExtent3D& extent, const VkFormat format, const VkImageUsageFlags usage, const VkSampleCountFlagBits samples)
 {
        const VkImageCreateInfo imageInfo       =
index 74e0eb2..251f39c 100644 (file)
@@ -24,6 +24,7 @@
  *//*--------------------------------------------------------------------*/
 
 #include "tcuDefs.hpp"
+#include "vkObjUtil.hpp"
 #include "vkRefUtil.hpp"
 #include "tcuTexture.hpp"
 
@@ -35,7 +36,6 @@ namespace MultiView
 vk::VkImageAspectFlags                         getAspectFlags                                  (tcu::TextureFormat format);
 vk::VkFormat                                           getStencilBufferFormat                  (const vk::VkFormat depthStencilImageFormat);
 vk::VkFormat                                           getDepthBufferFormat                    (const vk::VkFormat depthStencilImageFormat);
-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, const vk::VkSampleCountFlagBits samples);
 vk::Move<vk::VkFramebuffer>                    makeFramebuffer                                 (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkRenderPass renderPass, const std::vector<vk::VkImageView>& attachments, const deUint32 width, const deUint32 height, const deUint32 layers);
 vk::Move<vk::VkPipelineLayout>         makePipelineLayout                              (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout* pSetLayouts = DE_NULL);
index 58696ad..9c9a23e 100644 (file)
@@ -55,23 +55,6 @@ Image::Image (const vk::DeviceInterface&             vk,
 {
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkCommandBuffer> makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool)
 {
        return allocateCommandBuffer(vk, device, commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
index de939d3..d65f703 100644 (file)
@@ -76,7 +76,6 @@ private:
        Image&                                                          operator=               (const Image&);
 };
 
-vk::VkBufferCreateInfo                 makeBufferCreateInfo    (const vk::VkDeviceSize bufferSize, const vk::VkBufferUsageFlags usage);
 vk::Move<vk::VkCommandBuffer>  makeCommandBuffer               (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout              (const vk::DeviceInterface& vk, const vk::VkDevice device);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout              (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout);
index 2e8e797..53c1e06 100644 (file)
@@ -216,23 +216,6 @@ bool isImageSizeSupported (const InstanceInterface& instance, const VkPhysicalDe
        }
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               0u,                                                                             // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkBufferImageCopy makeBufferImageCopy (const VkExtent3D                extent,
                                                                           const deUint32               layerCount,
                                                                           const deUint32               mipmapLevel,
index 27c2d52..bffef7d 100644 (file)
@@ -24,6 +24,7 @@
  *//*--------------------------------------------------------------------*/
 
 #include "vkDefs.hpp"
+#include "vkObjUtil.hpp"
 #include "vkMemUtil.hpp"
 #include "vkRef.hpp"
 #include "vkRefUtil.hpp"
@@ -167,9 +168,6 @@ de::MovePtr<vk::Allocation>         bindBuffer                                                      (const vk::DeviceInterface&                     vk,
                                                                                                                                         const vk::VkBuffer                                     buffer,
                                                                                                                                         const vk::MemoryRequirement            requirement);
 
-vk::VkBufferCreateInfo                 makeBufferCreateInfo                            (const vk::VkDeviceSize                         bufferSize,
-                                                                                                                                        const vk::VkBufferUsageFlags           usage);
-
 vk::VkBufferImageCopy                  makeBufferImageCopy                                     (const vk::VkExtent3D                           extent,
                                                                                                                                         const deUint32                                         layersCount,
                                                                                                                                         const deUint32                                         mipmapLevel             = 0u,
index 126ac66..fd95500 100644 (file)
@@ -82,22 +82,6 @@ struct TestParameters
        TestType                qualifier;
 };
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize bufferSize, const VkBufferUsageFlags usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo       =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 VkImageCreateInfo makeImageCreateInfo (const VkImageType imageType, const VkExtent3D& extent, const VkFormat format, const VkImageUsageFlags usage, deUint32 queueFamilyIndex)
 {
        const VkImageCreateInfo imageInfo       =
index 34b65de..f577d05 100644 (file)
@@ -32,23 +32,6 @@ namespace synchronization
 {
 using namespace vk;
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkCommandBuffer> makeCommandBuffer (const DeviceInterface& vk, const VkDevice device, const VkCommandPool commandPool)
 {
        const VkCommandBufferAllocateInfo info =
index c6b5248..e0816cd 100644 (file)
@@ -24,6 +24,7 @@
  *//*--------------------------------------------------------------------*/
 
 #include "vkDefs.hpp"
+#include "vkObjUtil.hpp"
 #include "vkQueryUtil.hpp"
 #include "vkMemUtil.hpp"
 #include "vkRefUtil.hpp"
@@ -222,7 +223,6 @@ struct ImageResource
        vk::VkImageSubresourceLayers    subresourceLayers;
 };
 
-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<vk::VkCommandBuffer>  makeCommandBuffer                                                       (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkCommandPool commandPool);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout                                                      (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout);
index c46b458..d1d83ec 100644 (file)
@@ -34,23 +34,6 @@ namespace tessellation
 
 using namespace vk;
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkCommandPool> makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex)
 {
        const VkCommandPoolCreateInfo info =
index 2576624..c8fedab 100644 (file)
@@ -30,6 +30,7 @@
 #include "vkPrograms.hpp"
 #include "vkRefUtil.hpp"
 #include "vkQueryUtil.hpp"
+#include "vkObjUtil.hpp"
 
 #include "tcuVector.hpp"
 #include "tcuMaybe.hpp"
@@ -207,7 +208,6 @@ enum FeatureFlagBits
 };
 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<vk::VkCommandPool>            makeCommandPool                                                         (const vk::DeviceInterface& vk, const vk::VkDevice device, const deUint32 queueFamilyIndex);
 vk::Move<vk::VkPipelineLayout> makePipelineLayout                                                      (const vk::DeviceInterface& vk, const vk::VkDevice device, const vk::VkDescriptorSetLayout descriptorSetLayout);
index db88a4f..0bbf7d7 100644 (file)
@@ -96,23 +96,6 @@ inline SharedPtr<Unique<T> > makeSharedPtr(Move<T> move)
        return SharedPtr<Unique<T> >(new Unique<T>(move));
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   //  VkStructureType             sType;
-               DE_NULL,                                                                //  const void*                 pNext;
-               (VkBufferCreateFlags)0,                                 //  VkBufferCreateFlags flags;
-               bufferSize,                                                             //  VkDeviceSize                size;
-               usage,                                                                  //  VkBufferUsageFlags  usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              //  VkSharingMode               sharingMode;
-               0u,                                                                             //  deUint32                    queueFamilyIndexCount;
-               DE_NULL,                                                                //  const deUint32*             pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkPipelineLayout> makePipelineLayout (const DeviceInterface&              vk,
                                                                                   const VkDevice                               device)
 {
index c81135e..cff8634 100644 (file)
@@ -85,23 +85,6 @@ rr::PrimitiveType mapVkPrimitiveToRRPrimitive(const vk::VkPrimitiveTopology& pri
        return de::getSizedArrayElement<vk::VK_PRIMITIVE_TOPOLOGY_PATCH_LIST>(primitiveTypeTable, primitiveTopology);
 }
 
-VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize                    bufferSize,
-                                                                                const VkBufferUsageFlags       usage)
-{
-       const VkBufferCreateInfo bufferCreateInfo =
-       {
-               VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,   // VkStructureType              sType;
-               DE_NULL,                                                                // const void*                  pNext;
-               (VkBufferCreateFlags)0,                                 // VkBufferCreateFlags  flags;
-               bufferSize,                                                             // VkDeviceSize                 size;
-               usage,                                                                  // VkBufferUsageFlags   usage;
-               VK_SHARING_MODE_EXCLUSIVE,                              // VkSharingMode                sharingMode;
-               0u,                                                                             // deUint32                             queueFamilyIndexCount;
-               DE_NULL,                                                                // const deUint32*              pQueueFamilyIndices;
-       };
-       return bufferCreateInfo;
-}
-
 Move<VkCommandPool> makeCommandPool (const DeviceInterface& vk, const VkDevice device, const deUint32 queueFamilyIndex)
 {
        const VkCommandPoolCreateInfo info =