fill error that triangle vertex/index number bigger than buffer

Author: minggo

cocos/renderer/CCRenderer.cpp

@@ -211,22 +211,18 @@ Renderer::~Renderer()
     Director::getInstance()->getEventDispatcher()->removeEventListener(_cacheTextureListener);
 #endif
 
-    CC_SAFE_RELEASE(_vertexBuffer);
-    CC_SAFE_RELEASE(_indexBuffer);
     CC_SAFE_RELEASE(_commandBuffer);
 }
 
 void Renderer::init()
 {
-    auto device = backend::Device::getInstance();
-
-    _vertexBuffer = device->newBuffer(Renderer::VBO_SIZE * sizeof(_verts[0]), backend::BufferType::VERTEX, backend::BufferUsage::READ);
-    _vertexBuffer->updateData(_verts, Renderer::VBO_SIZE * sizeof(_verts[0]));
-
-    _indexBuffer = device->newBuffer(Renderer::INDEX_VBO_SIZE * sizeof(_indices[0]), backend::BufferType::INDEX, backend::BufferUsage::READ);
-    _indexBuffer->updateData(_indices, Renderer::INDEX_VBO_SIZE * sizeof(_indices[0]));
+    _triangleCommandBufferManager.init();
 
+    auto device = backend::Device::getInstance();
     _commandBuffer = device->newCommandBuffer();
+
+    _vertexBuffer = _triangleCommandBufferManager.getVertexBuffer();
+    _indexBuffer = _triangleCommandBufferManager.getIndexBuffer();
 }
 
 void Renderer::addCommand(RenderCommand* command)
@@ -290,7 +286,11 @@ void Renderer::processRenderCommand(RenderCommand* command)
                 CCASSERT(cmd->getIndexCount()>= 0 && cmd->getIndexCount() < INDEX_VBO_SIZE, "VBO for index is not big enough, please break the data down or use customized render command");
                 drawBatchedTriangles();
 
-                // TODO: should create a new buffer for it.
+                _triangleCommandBufferManager.prepareNextBuffer();
+                _queuedIndexCount = _queuedVertexCount = _queuedTotalIndexCount = _queuedTotalVertexCount = 0;
+
+                _vertexBuffer = _triangleCommandBufferManager.getVertexBuffer();
+                _indexBuffer = _triangleCommandBufferManager.getIndexBuffer();
             }
 
             // queue it
@@ -428,6 +428,9 @@ void Renderer::endFrame()
         _clearCommandManager.pushBackCommand(comand);
     _cachedClearCommands.clear();
 
+    _triangleCommandBufferManager.putbackAllBuffers();
+    _vertexBuffer = _triangleCommandBufferManager.getVertexBuffer();
+    _indexBuffer = _triangleCommandBufferManager.getIndexBuffer();
     _queuedTotalIndexCount = 0;
     _queuedTotalVertexCount = 0;
 }
@@ -611,15 +614,15 @@ void Renderer::drawBatchedTriangles()
     int prevMaterialID = -1;
     bool firstCommand = true;
 
-    unsigned int filledVertexCount = 0;
-    unsigned int filledIndexCount = 0;
+    _filledVertex = 0;
+    _filledIndex = 0;
 
     for(const auto& cmd : _queuedTriangleCommands)
     {
         auto currentMaterialID = cmd->getMaterialID();
         const bool batchable = !cmd->isSkipBatching();
 
-        fillVerticesAndIndices(cmd, vertexBufferFillOffset, filledVertexCount, filledIndexCount);
+        fillVerticesAndIndices(cmd, vertexBufferFillOffset, _filledVertex, _filledIndex);
 
         // in the same batch ?
         if (batchable && (prevMaterialID == currentMaterialID || firstCommand))
@@ -658,8 +661,8 @@ void Renderer::drawBatchedTriangles()
     }
     batchesTotal++;
 
-    _vertexBuffer->updateSubData(_verts, vertexBufferFillOffset * sizeof(_verts[0]), filledVertexCount * sizeof(_verts[0]));
-    _indexBuffer->updateSubData(_indices, indexBufferFillOffset * sizeof(_indices[0]), filledIndexCount * sizeof(_indices[0]));
+    _vertexBuffer->updateSubData(_verts, vertexBufferFillOffset * sizeof(_verts[0]), _filledVertex * sizeof(_verts[0]));
+    _indexBuffer->updateSubData(_indices, indexBufferFillOffset * sizeof(_indices[0]), _filledIndex * sizeof(_indices[0]));
 
     /************** 2: Draw *************/
     for (int i = 0; i < batchesTotal; ++i)
@@ -988,4 +991,73 @@ void Renderer::setScissorRect(float x, float y, float width, float height)
     _scissorState.rect.height = height;
 }
 
+// TriangleCommandBufferManager
+Renderer::TriangleCommandBufferManager::~TriangleCommandBufferManager()
+{
+    for (auto& vertexBuffer : _vertexBufferPool)
+        vertexBuffer->release();
+
+    for (auto& indexBuffer : _indexBufferPool)
+        indexBuffer->release();
+}
+
+void Renderer::TriangleCommandBufferManager::init()
+{
+    prepareNextBuffer();
+}
+
+void Renderer::TriangleCommandBufferManager::putbackAllBuffers()
+{
+    _currentBufferIndex = 0;
+}
+
+void Renderer::TriangleCommandBufferManager::prepareNextBuffer()
+{
+    if (_currentBufferIndex < (int)_vertexBufferPool.size() - 1)
+    {
+        ++_currentBufferIndex;
+        return;
+    }
+
+    auto device = backend::Device::getInstance();
+
+    auto tmpData = malloc(Renderer::VBO_SIZE * sizeof(_verts[0]));
+    if (!tmpData)
+        return;
+
+    auto vertexBuffer = device->newBuffer(Renderer::VBO_SIZE * sizeof(_verts[0]), backend::BufferType::VERTEX, backend::BufferUsage::READ);
+    if (!vertexBuffer)
+    {
+        free(tmpData);
+        return;
+    }
+    vertexBuffer->updateData(tmpData, Renderer::VBO_SIZE * sizeof(_verts[0]));
+
+    auto indexBuffer = device->newBuffer(Renderer::INDEX_VBO_SIZE * sizeof(_indices[0]), backend::BufferType::INDEX, backend::BufferUsage::READ);
+    if (! indexBuffer)
+    {
+        free(tmpData);
+        vertexBuffer->release();
+        return;
+    }
+    indexBuffer->updateData(tmpData, Renderer::INDEX_VBO_SIZE * sizeof(_indices[0]));
+
+    free(tmpData);
+
+    _vertexBufferPool.push_back(vertexBuffer);
+    _indexBufferPool.push_back(indexBuffer);
+
+    ++_currentBufferIndex;
+}
+
+backend::Buffer* Renderer::TriangleCommandBufferManager::getVertexBuffer() const
+{
+    return _vertexBufferPool[_currentBufferIndex];
+}
+
+backend::Buffer* Renderer::TriangleCommandBufferManager::getIndexBuffer() const
+{
+    return _indexBufferPool[_currentBufferIndex];
+}
+
 NS_CC_END

cocos/renderer/CCRenderer.h

@@ -101,11 +101,6 @@ class RenderQueue
     std::vector<RenderCommand*>& getSubQueue(QUEUE_GROUP group) { return _commands[group]; }
     /**Get the number of render commands contained in a subqueue.*/
     ssize_t getSubQueueSize(QUEUE_GROUP group) const { return _commands[group].size(); }
-
-    /**Save the current DepthState, CullState, DepthWriteState render state.*/
-//    void saveRenderState();
-//    /**Restore the saved DepthState, CullState, DepthWriteState render state.*/
-//    void restoreRenderState();
 
 protected:
     /**The commands in the render queue.*/
@@ -244,6 +239,23 @@ class CC_DLL Renderer
     void setScissorRect(float x, float y, float width, float height);
 
 protected:
+    class TriangleCommandBufferManager
+    {
+    public:
+        ~TriangleCommandBufferManager();
+
+        void init();
+        void putbackAllBuffers();
+        void prepareNextBuffer();
+        backend::Buffer* getVertexBuffer() const;
+        backend::Buffer* getIndexBuffer() const;
+
+    private:
+        int _currentBufferIndex = -1;
+        std::vector<backend::Buffer*> _vertexBufferPool;
+        std::vector<backend::Buffer*> _indexBufferPool;
+    };
+
     void drawBatchedTriangles();
     void drawCustomCommand(RenderCommand* command);
 
@@ -281,6 +293,7 @@ class CC_DLL Renderer
     unsigned short _indices[INDEX_VBO_SIZE];
     backend::Buffer* _vertexBuffer = nullptr;
     backend::Buffer* _indexBuffer = nullptr;
+    TriangleCommandBufferManager _triangleCommandBufferManager;
 
     backend::CommandBuffer* _commandBuffer = nullptr;
     backend::RenderPassDescriptor _renderPassDescriptor;
@@ -301,13 +314,12 @@ class CC_DLL Renderer
     // the TriBatches
     TriBatchToDraw* _triBatchesToDraw = nullptr;
 
-//    unsigned int _filledVertex = 0;
-//    unsigned int _filledIndex = 0;
-
     unsigned int _queuedTotalVertexCount = 0;
     unsigned int _queuedTotalIndexCount = 0;
     unsigned int _queuedVertexCount = 0;
     unsigned int _queuedIndexCount = 0;
+    unsigned int _filledIndex = 0;
+    unsigned int _filledVertex = 0;
 
     // stats
     unsigned int _drawnBatches = 0;