friendship with CGPUMeshPackerV2 ended, now Salman is CCPUMeshPackerV2's best friend.

Author: devshgraphicsprogramming

include/nbl/asset/utils/CCPUMeshPackerV2.h

@@ -30,7 +30,7 @@ class CCPUMeshPackerV2 final : public IMeshPackerV2<ICPUBuffer,ICPUDescriptorSet
 
     public:
         CCPUMeshPackerV2(const AllocationParams& allocParams, uint16_t minTriangleCountPerMDIData = 256u, uint16_t maxTriangleCountPerMDIData = 1024u)
-            :IMeshPackerV2<ICPUBuffer, ICPUMeshBuffer, MDIStructType>(allocParams, minTriangleCountPerMDIData, maxTriangleCountPerMDIData)
+            : base_t(allocParams,minTriangleCountPerMDIData,maxTriangleCountPerMDIData)
         {}
 
         void instantiateDataStorage();

include/nbl/asset/utils/IMeshPackerV2.h

@@ -222,6 +222,12 @@ class IMeshPackerV2Base
         }
     };
 
+    IMeshPackerV2Base() : m_virtualAttribConfig() {}
+    explicit IMeshPackerV2Base(const VirtualAttribConfig& cfg) : m_virtualAttribConfig()
+    {
+        m_virtualAttribConfig = cfg;
+    }
+
     VirtualAttribConfig m_virtualAttribConfig;
 };
 
@@ -358,7 +364,7 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
         std::function<core::smart_refctd_ptr<IDescriptor>(E_FORMAT)> createBufferView, const DSLayoutParamsUTB& params = {}
     ) const
     {
-        const uint32_t writeCount = getDSlayoutBindingsForUTB_internal(nullptr);
+        const uint32_t writeCount = getDSlayoutBindingsForUTB(nullptr);
         const uint32_t infoCount = 1u + // for the index buffer
             m_virtualAttribConfig.uintArrayElementsCnt +
             m_virtualAttribConfig.floatArrayElementsCnt +
@@ -391,33 +397,33 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
         };
 
         auto* write = outWrites;
-        auto writeBinding = [&bnd,dstSet,&info](uint32_t binding, uint32_t count)
+        auto writeBinding = [&write,dstSet,&info](uint32_t binding, uint32_t count)
         {
             write->binding = binding;
             write->arrayElement = 0u;
             write->count = count;
             write->descriptorType = asset::EDT_UNIFORM_TEXEL_BUFFER;
             write->dstSet = dstSet;
             write->info = info;
-            write++
+            write++;
         };
 
         writeBinding(params.usamplersBinding,1u+m_virtualAttribConfig.uintArrayElementsCnt);
         if (m_virtualAttribConfig.uintArrayElementsCnt)
-            fillInfoStruct(EUAT_INT);
+            fillInfoStruct(E_UTB_ARRAY_TYPE::EUAT_UINT);
         info->desc = createBufferView(EF_R16G16_UINT);
         info->buffer.offset = 0u;
         info->buffer.size = m_packerDataStore.indexBuffer->getSize();
         info++;
         if (m_virtualAttribConfig.floatArrayElementsCnt)
         {
             writeBinding(params.fsamplersBinding,1u+m_virtualAttribConfig.floatArrayElementsCnt);
-            fillInfoStruct(EUAT_FLOAT);
+            fillInfoStruct(E_UTB_ARRAY_TYPE::EUAT_FLOAT);
         }
         if (m_virtualAttribConfig.intArrayElementsCnt)
         {
             writeBinding(params.isamplersBinding,1u+m_virtualAttribConfig.intArrayElementsCnt);
-            fillInfoStruct(EUAT_INT);
+            fillInfoStruct(E_UTB_ARRAY_TYPE::EUAT_INT);
         }
 
         return std::make_pair(writeCount, infoCount);
@@ -566,8 +572,13 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
 
 protected:
 	IMeshPackerV2(const AllocationParams& allocParams, uint16_t minTriangleCountPerMDIData, uint16_t maxTriangleCountPerMDIData)
-		:base_t(minTriangleCountPerMDIData, maxTriangleCountPerMDIData),
-         m_allocParams(allocParams)
+		: base_t(minTriangleCountPerMDIData, maxTriangleCountPerMDIData), m_allocParams(allocParams)
+	{
+        initializeCommonAllocators(allocParams);
+    };
+    template<class OtherBufferType, class OtherDescriptorSetType, class OtherMeshBufferType>
+	explicit IMeshPackerV2(const IMeshPackerV2<OtherBufferType,OtherDescriptorSetType,OtherMeshBufferType,MDIStructType>* otherMp)
+		: base_t(cpuMP->m_minTriangleCountPerMDIData,cpuMP->m_maxTriangleCountPerMDIData), IMeshPackerV2Base(cpuMP->m_virtualAttribConfig), m_allocParams(otherMp->m_allocParams)
 	{
         initializeCommonAllocators(allocParams);
     };

include/nbl/video/CGPUMeshPackerV2.h

@@ -32,24 +32,21 @@ class CGPUMeshPackerV2 final : public asset::IMeshPackerV2<IGPUBuffer,IGPUDescri
 
     public:
         CGPUMeshPackerV2(IVideoDriver* driver, const AllocationParams& allocParams, uint16_t minTriangleCountPerMDIData = 256u, uint16_t maxTriangleCountPerMDIData = 1024u)
-            :IMeshPackerV2<IGPUBuffer, IGPUMeshBuffer, MDIStructType>(allocParams, minTriangleCountPerMDIData, maxTriangleCountPerMDIData),
-             m_driver(driver)
+            : base_t(allocParams,minTriangleCountPerMDIData,maxTriangleCountPerMDIData), m_driver(driver)
         {}
 
         // TODO: protect against empty cpuMP (no allocations and then shrinked)
         CGPUMeshPackerV2(IVideoDriver* driver, const asset::CCPUMeshPackerV2<MDIStructType>* cpuMP)
-            :IMeshPackerV2<IGPUBuffer,IGPUMeshBuffer,MDIStructType>(cpuMP->m_allocParams,cpuMP->m_minTriangleCountPerMDIData,cpuMP->m_maxTriangleCountPerMDIData),
-             m_driver(driver)
+            : base_t(cpuMP), m_driver(driver)
         {
-            m_virtualAttribConfig = cpuMP->m_virtualAttribConfig;
-
-            auto& cpuMDIBuff = cpuMP->m_packerDataStore.MDIDataBuffer;
-            auto& cpuIdxBuff = cpuMP->m_packerDataStore.indexBuffer;
-            auto& cpuVtxBuff = cpuMP->m_packerDataStore.vertexBuffer;
+            // TODO: protect against unitiliazed storage of cpuMP
+            auto& cpuMDIBuff = cpuMP->getPackerDataStore().MDIDataBuffer;
+            auto& cpuIdxBuff = cpuMP->getPackerDataStore().indexBuffer;
+            auto& cpuVtxBuff = cpuMP->getPackerDataStore().vertexBuffer;
 
             // TODO: why are the allocators not copied!?
 
-            // TODO: call instantiateDataStorage() here and then copy CPU data to the initialized storage
+            // TODO: call this->instantiateDataStorage() here and then copy CPU data to the initialized storage
             m_packerDataStore.MDIDataBuffer = driver->createFilledDeviceLocalGPUBufferOnDedMem(cpuMDIBuff->getSize(), cpuMDIBuff->getPointer());
             m_packerDataStore.indexBuffer = driver->createFilledDeviceLocalGPUBufferOnDedMem(cpuMDIBuff->getSize(), cpuMDIBuff->getPointer());
             m_packerDataStore.vertexBuffer = driver->createFilledDeviceLocalGPUBufferOnDedMem(cpuMDIBuff->getSize(), cpuMDIBuff->getPointer());