Fix curVertexCount/curIndexCount overflow on Error

sultim-t · Nov 12, 2023 · 5f6e500 · 5f6e500
1 parent 09d9662
commit 5f6e500
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/Source/VertexCollector.cpp b/Source/VertexCollector.cpp
@@ -147,6 +147,23 @@ auto RTGL1::VertexCollector::Upload( VertexCollectorFilterTypeFlags geomFlags,
     const bool     useIndices    = prim.indexCount != 0 && prim.pIndices != nullptr;
     const uint32_t triangleCount = useIndices ? prim.indexCount / 3 : prim.vertexCount / 3;
 
+
+
+    if( curVertexCount + prim.vertexCount >= bufVertices.ElementCount() )
+    {
+        debug::Error( geomFlags & FT::CF_DYNAMIC ? "Too many dynamic vertices: the limit is {}"
+                                                 : "Too many static vertices: the limit is {}",
+                      bufVertices.ElementCount() );
+        return {};
+    }
+    if( curIndexCount + ( useIndices ? prim.indexCount : 0 ) >= bufIndices.ElementCount() )
+    {
+        debug::Error( "Too many indices: the limit is {}", bufIndices.ElementCount() );
+        return {};
+    }
+
+
+
     // clang-format off
     curVertexCount          = vertIndex   + ( prim.vertexCount );
     curIndexCount           = indIndex    + ( useIndices ? prim.indexCount : 0 );
@@ -156,7 +173,6 @@ auto RTGL1::VertexCollector::Upload( VertexCollectorFilterTypeFlags geomFlags,
     curTexCoordCount_Layer3 = texcIndex_3 + ( GeomInfoManager::LayerExists( prim, 3 ) ? prim.vertexCount : 0 );
     // clang-format on
 
-
     if( resultRanges )
     {
         *resultRanges = CopyRanges{
@@ -169,22 +185,6 @@ auto RTGL1::VertexCollector::Upload( VertexCollectorFilterTypeFlags geomFlags,
     }
 
 
-    {
-        if( curVertexCount >= bufVertices.ElementCount() )
-        {
-            debug::Error( geomFlags & FT::CF_DYNAMIC ? "Too many dynamic vertices: the limit is {}"
-                                                     : "Too many static vertices: the limit is {}",
-                          bufVertices.ElementCount() );
-            return {};
-        }
-        if( curIndexCount >= bufIndices.ElementCount() )
-        {
-            debug::Error( "Too many indices: the limit is {}", bufIndices.ElementCount() );
-            return {};
-        }
-    }
-
-
 
     // copy data to buffers
     CopyVertexDataToStaging( prim, vertIndex, texcIndex_1, texcIndex_2, texcIndex_3 );