Fixed the vertex counts for reservations

Author: devshgraphicsprogramming

include/nbl/asset/IMeshPackerV2.h

@@ -249,7 +249,8 @@ bool IMeshPackerV2<MeshBufferType, BufferType, MDIStructType>::alloc(ReservedAll
     {
         ReservedAllocationMeshBuffers& ramb = *(rambOut + i);
         const size_t idxCnt = (*it)->getIndexCount();
-        const size_t maxVtxCnt = IMeshManipulator::upperBoundVertexID(*it); //ahsdfjkasdfgasdklfhasdf TODO: deal with vertex duplication, same for v1
+        // TODO: deal with per-instance attributes!!
+        const size_t maxVtxCnt = calcVertexCountBoundWithBatchDuplication(IMeshManipulator::getPolyCount(*it));
 
         //allocate indices
         ramb.indexAllocationOffset = m_idxBuffAlctr.alloc_addr(idxCnt, 1u);

include/nbl/asset/utils/CCPUMeshPackerV1.h

@@ -258,7 +258,7 @@ typename CCPUMeshPackerV1<MDIStructType>::ReservedAllocationMeshBuffers CCPUMesh
 	{
 		ICPUMeshBuffer* mb = *it;
 		idxCnt += mb->getIndexCount();
-		vtxCnt += IMeshManipulator::upperBoundVertexID(mb);
+		vtxCnt += calcVertexCountBoundWithBatchDuplication(IMeshManipulator::getPolyCount(mb));
 	}
 
 	const uint32_t minIdxCntPerPatch = m_minTriangleCountPerMDIData * 3;

include/nbl/asset/utils/IMeshPacker.h

@@ -5,6 +5,8 @@
 #ifndef __NBL_ASSET_I_MESH_PACKER_H_INCLUDED__
 #define __NBL_ASSET_I_MESH_PACKER_H_INCLUDED__
 
+#include "nbl/asset/utils/IMeshManipulator.h"
+
 namespace nbl
 {
 namespace asset
@@ -45,6 +47,7 @@ class IMeshPackerBase
 
     struct AllocationParamsCommon
     {
+        // TODO: review all names and documnetation!
         size_t indexBuffSupportedCnt = 1073741824ull;                  /*   2GB*/
         size_t vertexBuffSupportedSize = 1ull << 31ull;                /*   2GB*/
         size_t MDIDataBuffSupportedCnt = 16777216ull;                  /*   16MB assuming MDIStructType is DrawElementsIndirectCommand_t*/
@@ -125,7 +128,12 @@ class IMeshPacker : public IMeshPackerBase
         return size;
     }
 
-    inline constexpr uint32_t calcBatchCount(uint32_t triCnt)
+    inline constexpr uint32_t calcVertexCountBoundWithBatchDuplication(uint32_t triCnt)
+    {
+        return triCnt*3u;
+    }
+
+    inline constexpr uint32_t calcBatchCountBound(uint32_t triCnt)
     {
         if (triCnt!=0u)
             return (triCnt-1u)/m_minTriangleCountPerMDIData+1u;
@@ -144,13 +152,40 @@ class IMeshPacker : public IMeshPackerBase
 
     core::vector<TriangleBatch> constructTriangleBatches(MeshBufferType* meshBuffer)
     {
-        const size_t idxCnt = meshBuffer->getIndexCount();
-        const uint32_t triCnt = idxCnt / 3;
-        assert(idxCnt % 3 == 0);
+        uint32_t triCnt;
+        const bool success = IMeshManipulator::getPolyCount(meshBuffer);
+        assert(success);
+
+        const uint32_t batchCount = calcBatchCountBound(triCnt);
+        /*
+        TODO:
+
+        //struct TriangleMortonCodePair
+        //{
+        //	Triangle triangle;
+        //	//uint64_t mortonCode; TODO after benchmarks
+        //};
+        
+        core::vector<TriangleMortonCodePair> triangles(triCnt);
+        uint32_t ix=0u;
+        for (auto it=triangles.begin(); it!=triangles.end(); it++)
+        {
+            *it = IMeshManipulator::getTriangleIndices(meshbuffer,ix++);
+        }
+
+        std::sort(triangles.begin(),triangles.end(),[]()->bool{return lhs.mortonCode<rhs.mortonCode;}); // maybe use our new core::radix_sort?
 
-        const uint32_t batchCount = calcBatchCount(triCnt);
+        // do batch splitting
+        core::vector<const TriangleMortonCodePair*> batches;
+        batches.reserve(calcBatchCountBound(triCnt)+1u); // actual batch count will be different
+        {
+            // use batches.push_back();
+        }
+        batches.push_back(triangles.data()+triangles.size());
 
-        core::vector<TriangleBatch> output(batchCount);
+        return {std::move(triangles),std::move(batches)};
+        */
+        core::vector<TriangleBatch> output(batchCount); // nested vectors are evil
 
         for (uint32_t i = 0u; i < batchCount; i++)
         {
@@ -166,12 +201,6 @@ class IMeshPacker : public IMeshPackerBase
             output[i].triangles = core::vector<Triangle>(m_maxTriangleCountPerMDIData);
         }
 
-        //struct TriangleMortonCodePair
-        //{
-        //	Triangle triangle;
-        //	//uint64_t mortonCode; TODO after benchmarks
-        //};
-
         //TODO: triangle reordering
 
         const auto& srcIdxBuffer = meshBuffer->getIndexBufferBinding();