CPipelineBarrierCmd needs the definition of S{Buffer/Image}MemoryBarrier. NOT COMPILING RIGHT NOW.

Author: achalpandeyy

include/nbl/video/IGPUCommandPool.h

@@ -9,6 +9,8 @@
 #include "nbl/video/decl/IBackendObject.h"
 #include "nbl/video/IGPUPipelineLayout.h"
 
+#include "nbl/asset/ICPUCommandBuffer.h"
+
 namespace nbl::video
 {
 class IGPUCommandBuffer;
@@ -425,19 +427,19 @@ class IGPUCommandPool::CBeginRenderPassCmd : public IGPUCommandPool::IFixedSizeC
 class IGPUCommandPool::CPipelineBarrierCmd : public IGPUCommandPool::ICommand
 {
 public:
-    CPipelineBarrierCmd(const uint32_t bufferCount, const core::smart_refctd_ptr<const IGPUBuffer>* buffers, const uint32_t imageCount, const core::smart_refctd_ptr<const IGPUImage>* images)
-        : ICommand(calc_size(bufferCount, buffers, imageCount, images)), m_resourceCount(bufferCount+imageCount)
+    CPipelineBarrierCmd(const uint32_t bufferCount, const asset::ICPUCommandBuffer::SBufferMemoryBarrier* bufferMemoryBarriers, const uint32_t imageCount, const asset::ICPUCommandBuffer::SImageMemoryBarrier* imageMemoryBarriers)
+        : ICommand(calc_size(bufferCount, bufferMemoryBarriers, imageCount, imageMemoryBarriers)), m_resourceCount(bufferCount+imageCount)
     {
         auto barrierResources = getBarrierResources();
         std::uninitialized_default_construct_n(barrierResources, m_resourceCount);
 
         uint32_t k = 0;
 
         for (auto i = 0; i < bufferCount; ++i)
-            barrierResources[k++] = buffers[i];
+            barrierResources[k++] = bufferMemoryBarriers[i].buffer;
 
         for (auto i = 0; i < imageCount; ++i)
-            barrierResources[k++] = images[i];
+            barrierResources[k++] = imageMemoryBarriers[i].image;
     }
 
     ~CPipelineBarrierCmd()
@@ -447,7 +449,7 @@ class IGPUCommandPool::CPipelineBarrierCmd : public IGPUCommandPool::ICommand
             barrierResources[i].~smart_refctd_ptr();
     }
 
-    static uint32_t calc_size(const uint32_t bufferCount, const core::smart_refctd_ptr<const IGPUBuffer>* buffers, const uint32_t imageCount, const core::smart_refctd_ptr<const IGPUImage>* images)
+    static uint32_t calc_size(const uint32_t bufferCount, const asset::ICPUCommandBuffer::SBufferMemoryBarrier* bufferMemoryBarriers, const uint32_t imageCount, const asset::ICPUCommandBuffer::SImageMemoryBarrier* imageMemoryBarriers)
     {
         return core::alignUp(sizeof(CPipelineBarrierCmd) + (bufferCount+imageCount)*sizeof(core::smart_refctd_ptr<const core::IReferenceCounted>), alignof(CPipelineBarrierCmd));
     }
@@ -461,11 +463,14 @@ class IGPUCommandPool::CPipelineBarrierCmd : public IGPUCommandPool::ICommand
 class IGPUCommandPool::CBindDescriptorSetsCmd : public IGPUCommandPool::IFixedSizeCommand<CBindDescriptorSetsCmd>
 {
 public:
-    CBindDescriptorSetsCmd(core::smart_refctd_ptr<const IGPUPipelineLayout>&& pipelineLayout, const uint32_t setCount, const core::smart_refctd_ptr<const IGPUDescriptorSet>* sets)
+    CBindDescriptorSetsCmd(core::smart_refctd_ptr<const IGPUPipelineLayout>&& pipelineLayout, const uint32_t setCount, const IGPUDescriptorSet* const* const sets)
         : m_layout(std::move(pipelineLayout))
     {
         for (auto i = 0; i < setCount; ++i)
-            m_sets[i] = sets[i];
+        {
+            assert(i < IGPUPipelineLayout::DESCRIPTOR_SET_COUNT);
+            m_sets[i] = core::smart_refctd_ptr<const video::IGPUDescriptorSet>(sets[i]);
+        }
     }
 
 private:

src/nbl/video/IGPUCommandBuffer.cpp

@@ -195,18 +195,7 @@ bool IGPUCommandBuffer::pipelineBarrier(core::bitflag<asset::E_PIPELINE_STAGE_FL
     if ((memoryBarrierCount == 0u) && (bufferMemoryBarrierCount == 0u) && (imageMemoryBarrierCount == 0u))
         return false;
 
-    constexpr auto MaxBarrierResourceCount = (1 << 12) / sizeof(void*);
-    assert(bufferMemoryBarrierCount + imageMemoryBarrierCount <= MaxBarrierResourceCount);
-
-    core::smart_refctd_ptr<const IGPUBuffer> bufferResources[MaxBarrierResourceCount];
-    for (auto i = 0; i < bufferMemoryBarrierCount; ++i)
-        bufferResources[i] = pBufferMemoryBarriers[i].buffer;
-
-    core::smart_refctd_ptr<const IGPUImage> imageResources[MaxBarrierResourceCount];
-    for (auto i = 0; i < imageMemoryBarrierCount; ++i)
-        imageResources[i] = pImageMemoryBarriers[i].image;
-
-    if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CPipelineBarrierCmd>(m_commandList, bufferMemoryBarrierCount, bufferResources, imageMemoryBarrierCount, imageResources))
+    if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CPipelineBarrierCmd>(m_commandList, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers))
         return false;
 
     pipelineBarrier_impl(srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers);
@@ -240,14 +229,7 @@ bool IGPUCommandBuffer::bindDescriptorSets(asset::E_PIPELINE_BIND_POINT pipeline
         }
     }
 
-    core::smart_refctd_ptr<const video::IGPUDescriptorSet> descriptorSets_refctd[IGPUPipelineLayout::DESCRIPTOR_SET_COUNT] = { nullptr };
-    for (auto i = 0; i < descriptorSetCount; ++i)
-    {
-        assert(i < IGPUPipelineLayout::DESCRIPTOR_SET_COUNT);
-        descriptorSets_refctd[i] = core::smart_refctd_ptr<const video::IGPUDescriptorSet>(pDescriptorSets[i]);
-    }
-
-    if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CBindDescriptorSetsCmd>(m_commandList, core::smart_refctd_ptr<const IGPUPipelineLayout>(layout), descriptorSetCount, descriptorSets_refctd))
+    if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CBindDescriptorSetsCmd>(m_commandList, core::smart_refctd_ptr<const IGPUPipelineLayout>(layout), descriptorSetCount, pDescriptorSets))
         return false;
 
     for (uint32_t i = 0u; i < descriptorSetCount; ++i)