Fix couple of invalid VkBufferCreateInfos and ws violations in command buffer tests

diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.cpp
index ca2aca0..7d44b9d 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.cpp
@@ -57,22 +57,22 @@ Move<VkBuffer> createColorDataBuffer (deUint32 offset,
 
        DE_ASSERT(offset + sizeof(tcu::Vec4[2]) <= bufferSize);
 
-       const VkBufferUsageFlags                                usageFlags                              = (VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
-       const VkBufferCreateInfo                                createInfo                              =
+       const VkBufferUsageFlags                                usageFlags                              = (VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
+       const VkBufferCreateInfo                                createInfo                              =
        {
                VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
                DE_NULL,
+               0u,                                                                                                                     // flags
                (VkDeviceSize) bufferSize,                                                                      // size
                usageFlags,                                                                                                     // usage
-               0u,                                                                                                                     // flags
                VK_SHARING_MODE_EXCLUSIVE,                                                                      // sharingMode
                0u,                                                                                                                     // queueFamilyCount
                DE_NULL,                                                                                                        // pQueueFamilyIndices
        };
        Move<VkBuffer> buffer(createBuffer(vki, device, &createInfo));
 
-       const VkMemoryRequirements                              requirements                    = getBufferMemoryRequirements(vki, device, *buffer);
-       de::MovePtr<Allocation>                                 allocation                              = allocator.allocate(requirements, MemoryRequirement::HostVisible);
+       const VkMemoryRequirements                              requirements                    = getBufferMemoryRequirements(vki, device, *buffer);
+       de::MovePtr<Allocation>                                 allocation                              = allocator.allocate(requirements, MemoryRequirement::HostVisible);
 
        VK_CHECK(vki.bindBufferMemory(device, *buffer, allocation->getMemory(), allocation->getOffset()));
 
@@ -99,7 +99,7 @@ Move<VkDescriptorSetLayout> createDescriptorSetLayout (vkt::Context& context)
        const DeviceInterface&                                  vki                                             = context.getDeviceInterface();
        const VkDevice                                                  device                                  = context.getDevice();
 
-       DescriptorSetLayoutBuilder                              builder;
+       DescriptorSetLayoutBuilder                              builder;
 
        builder.addSingleBinding(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, VK_SHADER_STAGE_COMPUTE_BIT);
        builder.addSingleBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_COMPUTE_BIT);
@@ -109,8 +109,8 @@ Move<VkDescriptorSetLayout> createDescriptorSetLayout (vkt::Context& context)
 
 Move<VkDescriptorPool> createDescriptorPool (vkt::Context& context)
 {
-       const DeviceInterface&                                  vki                                     = context.getDeviceInterface();
-       const VkDevice                                                  device                                  = context.getDevice();
+       const DeviceInterface&                                  vki                                             = context.getDeviceInterface();
+       const VkDevice                                                  device                                  = context.getDevice();
 
        return vk::DescriptorPoolBuilder()
                .addType(vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)

diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.hpp b/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.hpp
index 148eafc..db2e061 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.hpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.hpp
@@ -66,4 +66,4 @@ vk::Move<vk::VkDescriptorSet>                 createDescriptorSet (vk::VkDescriptorPool pool,
 } // api
 } // vkt
 
-#endif //_VKTAPIBUFFERCOMPUTEINSTANCE_HPP
+#endif // _VKTAPIBUFFERCOMPUTEINSTANCE_HPP

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
index a7d974a..dc67409 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
@@ -2924,7 +2924,7 @@ tcu::TestStatus orderBindPipelineTest(Context& context)
        Unique<VkPipelineLayout>                                pipelineLayout                  (createPipelineLayout(vk, device, &layoutCreateInfo));
 
        const Unique<VkShaderModule>                    computeModuleGood               (createShaderModule(vk, device, context.getBinaryCollection().get("compute_good"), (VkShaderModuleCreateFlags)0u));
-       const Unique<VkShaderModule>                    computeModuleBad                (createShaderModule(vk, device, context.getBinaryCollection().get("compute_bad"),  (VkShaderModuleCreateFlags)0u));
+       const Unique<VkShaderModule>                    computeModuleBad                (createShaderModule(vk, device, context.getBinaryCollection().get("compute_bad"),  (VkShaderModuleCreateFlags)0u));
 
        const VkPipelineShaderStageCreateInfo   shaderCreateInfoGood    =
        {
@@ -2970,8 +2970,8 @@ tcu::TestStatus orderBindPipelineTest(Context& context)
                0u,                                                                                                                     // basePipelineIndex
        };
 
-       const Unique<VkPipeline>                                pipelineGood                    (createComputePipeline(vk, device, (VkPipelineCache)0u, &createInfoGood));
-       const Unique<VkPipeline>                                pipelineBad                             (createComputePipeline(vk, device, (VkPipelineCache)0u, &createInfoBad));
+       const Unique<VkPipeline>                                pipelineGood                    (createComputePipeline(vk, device, (VkPipelineCache)0u, &createInfoGood));
+       const Unique<VkPipeline>                                pipelineBad                             (createComputePipeline(vk, device, (VkPipelineCache)0u, &createInfoBad));
 
        const VkAccessFlags                                             inputBit                                = (VK_ACCESS_UNIFORM_READ_BIT);
        const VkBufferMemoryBarrier                             bufferBarrierA                  =
@@ -3078,7 +3078,7 @@ tcu::TestStatus orderBindPipelineTest(Context& context)
        VK_CHECK(vk.endCommandBuffer(*cmd));
 
        // run
-       // submit second primary buffer, the secondary should be executed too
+       // submit second primary buffer, the secondary should be executed too
        const VkSubmitInfo                                              submitInfo                              =
        {
                VK_STRUCTURE_TYPE_SUBMIT_INFO,                                                          // sType
@@ -3212,21 +3212,21 @@ tcu::TestCaseGroup* createCommandBuffersTests (tcu::TestContext& testCtx)
        addFunctionCase                         (commandBuffersTests.get(), "pool_reset_no_flags_res",                  "",     resetPoolNoFlagsTest);
        /* 19.2. Command Buffer Lifetime (6.2 in VK 1.0 Spec) */
        addFunctionCase                         (commandBuffersTests.get(), "allocate_single_primary",                  "", allocatePrimaryBufferTest);
-       addFunctionCase                         (commandBuffersTests.get(), "allocate_many_primary",                    "",     allocateManyPrimaryBuffersTest);
+       addFunctionCase                         (commandBuffersTests.get(), "allocate_many_primary",                    "",     allocateManyPrimaryBuffersTest);
        addFunctionCase                         (commandBuffersTests.get(), "allocate_zero_primary",                    "", allocateZeroPrimaryBuffersTest);
-       addFunctionCase                         (commandBuffersTests.get(), "allocate_single_secondary",                "", allocateSecondaryBufferTest);
-       addFunctionCase                         (commandBuffersTests.get(), "allocate_many_secondary",                  "", allocateManySecondaryBuffersTest);
+       addFunctionCase                         (commandBuffersTests.get(), "allocate_single_secondary",                "", allocateSecondaryBufferTest);
+       addFunctionCase                         (commandBuffersTests.get(), "allocate_many_secondary",                  "", allocateManySecondaryBuffersTest);
        addFunctionCase                         (commandBuffersTests.get(), "allocate_zero_secondary",                  "", allocateZeroSecondaryBuffersTest);
        addFunctionCase                         (commandBuffersTests.get(), "execute_small_primary",                    "",     executePrimaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "execute_large_primary",                    "",     executeLargePrimaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "reset_implicit",                                   "", resetBufferImplicitlyTest);
        /* 19.3. Command Buffer Recording (6.3 in VK 1.0 Spec) */
        addFunctionCase                         (commandBuffersTests.get(), "record_single_primary",                    "",     recordSinglePrimaryBufferTest);
-       addFunctionCase                         (commandBuffersTests.get(), "record_many_primary",                              "", recordLargePrimaryBufferTest);
+       addFunctionCase                         (commandBuffersTests.get(), "record_many_primary",                              "", recordLargePrimaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "record_single_secondary",                  "",     recordSingleSecondaryBufferTest);
-       addFunctionCase                         (commandBuffersTests.get(), "record_many_secondary",                    "", recordLargeSecondaryBufferTest);
+       addFunctionCase                         (commandBuffersTests.get(), "record_many_secondary",                    "", recordLargeSecondaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "submit_twice_primary",                             "",     submitPrimaryBufferTwiceTest);
-       addFunctionCase                         (commandBuffersTests.get(), "submit_twice_secondary",                   "",     submitSecondaryBufferTwiceTest);
+       addFunctionCase                         (commandBuffersTests.get(), "submit_twice_secondary",                   "",     submitSecondaryBufferTwiceTest);
        addFunctionCase                         (commandBuffersTests.get(), "record_one_time_submit_primary",   "",     oneTimeSubmitFlagPrimaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "record_one_time_submit_secondary", "",     oneTimeSubmitFlagSecondaryBufferTest);
        addFunctionCase                         (commandBuffersTests.get(), "record_simul_use_primary",                 "",     simultaneousUsePrimaryBufferTest);
@@ -3239,10 +3239,10 @@ tcu::TestCaseGroup* createCommandBuffersTests (tcu::TestContext& testCtx)
        addFunctionCase                         (commandBuffersTests.get(), "submit_count_equal_zero",                  "", submitBufferCountEqualZero);
        addFunctionCase                         (commandBuffersTests.get(), "submit_null_fence",                                "", submitBufferNullFence);
        /* 19.5. Secondary Command Buffer Execution (6.6 in VK 1.0 Spec) */
-       addFunctionCase                         (commandBuffersTests.get(), "secondary_execute",                                "",     executeSecondaryBufferTest);
-       addFunctionCase                         (commandBuffersTests.get(), "secondary_execute_twice",                  "",     executeSecondaryBufferTwiceTest);
+       addFunctionCase                         (commandBuffersTests.get(), "secondary_execute",                                "",     executeSecondaryBufferTest);
+       addFunctionCase                         (commandBuffersTests.get(), "secondary_execute_twice",                  "",     executeSecondaryBufferTwiceTest);
        /* 19.6. Commands Allowed Inside Command Buffers (6.7 in VK 1.0 Spec) */
-       addFunctionCaseWithPrograms (commandBuffersTests.get(), "order_bind_pipeline",                          "", genComputeSource, orderBindPipelineTest);
+       addFunctionCaseWithPrograms (commandBuffersTests.get(), "order_bind_pipeline",                          "", genComputeSource, orderBindPipelineTest);
 
        return commandBuffersTests.release();
 }

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.hpp b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.hpp
index cbc3197..e5f2bd2 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.hpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.hpp
@@ -45,4 +45,4 @@ tcu::TestCaseGroup* createCommandBuffersTests (tcu::TestContext& testCtx);
 } // api
 } // vkt
 
-#endif /* _VKTAPICOMMANDBUFFERSTESTS_HPP */
+#endif // _VKTAPICOMMANDBUFFERSTESTS_HPP

diff --git a/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp b/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp
index 037f29d..a6deb91 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp
@@ -68,21 +68,21 @@ Move<VkBuffer> ComputeInstanceResultBuffer::createResultBuffer(const DeviceInter
        {
                VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
                DE_NULL,
+               0u,                                                                                                                     // flags
                (VkDeviceSize) DATA_SIZE,                                                                       // size
                VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,                                                     // usage
-               0u,                                                                                                                     // flags
                VK_SHARING_MODE_EXCLUSIVE,                                                                      // sharingMode
-               0u,                                                                                                                     // queueFamilyCount
+               0u,                                                                                                                     // queueFamilyCount
                DE_NULL,                                                                                                        // pQueueFamilyIndices
        };
 
        Move<VkBuffer> buffer(createBuffer(vki, device, &createInfo));
 
        const VkMemoryRequirements                              requirements                    = getBufferMemoryRequirements(vki, device, *buffer);
-       de::MovePtr<Allocation>                                 allocation                              = allocator.allocate(requirements, MemoryRequirement::HostVisible);
+       de::MovePtr<Allocation>                                 allocation                              = allocator.allocate(requirements, MemoryRequirement::HostVisible);
 
-       const float                                                     clearValue                              = -1.0f;
-       void                                                                    *mapPtr                                 = allocation->getHostPtr();
+       const float                                                             clearValue                              = -1.0f;
+       void*                                                                   mapPtr                                  = allocation->getHostPtr();
 
        for (size_t offset = 0; offset < DATA_SIZE; offset += sizeof(float))
                deMemcpy(((deUint8 *) mapPtr) + offset, &clearValue, sizeof(float));
@@ -103,7 +103,7 @@ VkBufferMemoryBarrier ComputeInstanceResultBuffer::createResultBufferBarrier(VkB
                VK_ACCESS_SHADER_READ_BIT,                                                                      // inputMask
                VK_QUEUE_FAMILY_IGNORED,                                                                        // srcQueueFamilyIndex
                VK_QUEUE_FAMILY_IGNORED,                                                                        // destQueueFamilyIndex
-               buffer,                                                                                                         // buffer
+               buffer,                                                                                                         // buffer
                (VkDeviceSize) 0u,                                                                                      // offset
                DATA_SIZE,                                                                                                      // size
        };

diff --git a/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.hpp b/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.hpp
index b9310c7..f379a5f 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.hpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.hpp
@@ -60,7 +60,7 @@ public:
 
        void                                                                    readResultContentsTo(tcu::Vec4 (* results)[4]) const;
 
-       inline vk::VkBuffer                                     getBuffer(void) const { return *m_buffer; }
+       inline vk::VkBuffer                                             getBuffer(void) const { return *m_buffer; }
 
        inline const void *                                             getResultReadBarrier(void) const { return &m_bufferBarrier; }
 
@@ -83,4 +83,4 @@ private:
 } // api
 } // vkt
 
-#endif //_VKTAPICOMPUTEINSTANCERESULTBUFFER_HPP
+#endif // _VKTAPICOMPUTEINSTANCERESULTBUFFER_HPP