remove arrays of vertex buffer (#20022)

Author: Mee-gu

cocos/renderer/CCRenderer.cpp

@@ -634,7 +634,7 @@ void Renderer::drawBatchedTriangles()
     for (int i = 0; i < batchesTotal; ++i)
     {
         beginRenderPass(_triBatchesToDraw[i].cmd);
-        _commandBuffer->setVertexBuffer(0, _vertexBuffer);
+        _commandBuffer->setVertexBuffer(_vertexBuffer);
         _commandBuffer->setIndexBuffer(_indexBuffer);
         auto& pipelineDescriptor = _triBatchesToDraw[i].cmd->getPipelineDescriptor();
         _commandBuffer->setProgramState(pipelineDescriptor.programState);
@@ -664,7 +664,7 @@ void Renderer::drawCustomCommand(RenderCommand *command)
     if (cmd->getBeforeCallback()) cmd->getBeforeCallback()();
 
     beginRenderPass(command);
-    _commandBuffer->setVertexBuffer(0, cmd->getVertexBuffer());
+    _commandBuffer->setVertexBuffer(cmd->getVertexBuffer());
     _commandBuffer->setProgramState(cmd->getPipelineDescriptor().programState);
 
     auto drawType = cmd->getDrawType();

cocos/renderer/backend/CommandBuffer.h

@@ -98,10 +98,9 @@ class CommandBuffer : public cocos2d::Ref
 
     /**
      * Set a global buffer for all vertex shaders at the given bind point index 0.
-     * @param index An index in the buffer argument table.
      * @param buffer The vertex buffer to be setted in the buffer argument table.
      */
-    virtual void setVertexBuffer(unsigned int index, Buffer* buffer) = 0;
+    virtual void setVertexBuffer(Buffer* buffer) = 0;
 
     /**
      * Set unifroms and textures

cocos/renderer/backend/metal/CommandBufferMTL.h

@@ -97,10 +97,9 @@ class CommandBufferMTL final : public CommandBuffer
 
     /**
      * Set a global buffer for all vertex shaders at the given bind point index 0.
-     * @param index An index in the buffer argument table.
      * @param buffer The buffer to set in the buffer argument table.
      */
-    virtual void setVertexBuffer(unsigned int index, Buffer* buffer) override;
+    virtual void setVertexBuffer(Buffer* buffer) override;
 
     /**
      * Set the uniform data at a given vertex and fragment buffer binding point 1

cocos/renderer/backend/metal/CommandBufferMTL.mm

@@ -292,7 +292,7 @@ MTLCullMode toMTLCullMode(CullMode mode)
     [_mtlRenderEncoder setFrontFacingWinding:toMTLWinding(winding)];
 }
 
-void CommandBufferMTL::setVertexBuffer(unsigned int index, Buffer* buffer)
+void CommandBufferMTL::setVertexBuffer(Buffer* buffer)
 {
     // Vertex buffer is bound in index 0.
     [_mtlRenderEncoder setVertexBuffer:static_cast<BufferMTL*>(buffer)->getMTLBuffer()

cocos/renderer/backend/opengl/CommandBufferGL.cpp

@@ -319,19 +319,15 @@ void CommandBufferGL::setIndexBuffer(Buffer* buffer)
     _indexBuffer = static_cast<BufferGL*>(buffer);
 }
 
-void CommandBufferGL::setVertexBuffer(unsigned int index, Buffer* buffer)
+void CommandBufferGL::setVertexBuffer(Buffer* buffer)
 {
     assert(buffer != nullptr);
     if (buffer == nullptr)
         return;
 
     buffer->retain();
 
-    if (index >= _vertexBuffers.size())
-        _vertexBuffers.resize(index + 1);
-
-    CC_SAFE_RELEASE(_vertexBuffers[index]);
-    _vertexBuffers[index] = static_cast<BufferGL*>(buffer);
+    _vertexBuffer = static_cast<BufferGL*>(buffer);
 }
 
 void CommandBufferGL::setProgramState(ProgramState* programState)
@@ -419,31 +415,23 @@ void CommandBufferGL::bindVertexBuffer(ProgramGL *program) const
     int i = 0;
     const auto& attributeInfos = program->getAttributeInfos();
     const auto& vertexLayouts = getVertexLayouts();
-    for (const auto& vertexBuffer : _vertexBuffers)
-    {
-        if (! vertexBuffer)
-            continue;
-        if (i >= attributeInfos.size())
-            break;
-        
-        glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer->getHandler());
+    
+    glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer->getHandler());
 
-        const auto& attributeInfo = attributeInfos[i];
-        const auto &layouts = vertexLayouts->at(i);
-        for (const auto& attribute : attributeInfo)
-        {
-            const auto &layoutInfo = layouts.getAttributes().at(attribute.name);
-            glEnableVertexAttribArray(attribute.location);
-            glVertexAttribPointer(attribute.location,
-                UtilsGL::getGLAttributeSize(layoutInfo.format),
-                UtilsGL::toGLAttributeType(layoutInfo.format),
-                layoutInfo.needToBeNormallized,
-                layouts.getStride(),
-                (GLvoid*)layoutInfo.offset);
-        }
-        
-        ++i;
+    const auto& attributeInfo = attributeInfos[i];
+    const auto &layouts = vertexLayouts->at(i);
+    for (const auto& attribute : attributeInfo)
+    {
+        const auto &layoutInfo = layouts.getAttributes().at(attribute.name);
+        glEnableVertexAttribArray(attribute.location);
+        glVertexAttribPointer(attribute.location,
+            UtilsGL::getGLAttributeSize(layoutInfo.format),
+            UtilsGL::toGLAttributeType(layoutInfo.format),
+            layoutInfo.needToBeNormallized,
+            layouts.getStride(),
+            (GLvoid*)layoutInfo.offset);
     }
+      
 }
 
 void CommandBufferGL::setUniforms(ProgramGL* program) const
@@ -598,11 +586,7 @@ void CommandBufferGL::cleanResources()
     CC_SAFE_RELEASE_NULL(_indexBuffer);
     CC_SAFE_RELEASE_NULL(_renderPipeline);
     CC_SAFE_RELEASE_NULL(_programState);
-      
-    for (const auto& vertexBuffer : _vertexBuffers)
-        CC_SAFE_RELEASE(vertexBuffer);
-    
-    _vertexBuffers.clear();
+    CC_SAFE_RELEASE(_vertexBuffer);
 }
 
 void CommandBufferGL::setLineWidth(float lineWidth)

cocos/renderer/backend/opengl/CommandBufferGL.h

@@ -96,10 +96,9 @@ class CommandBufferGL final : public CommandBuffer
 
     /**
      * Set a global buffer for all vertex shaders at the given bind point index 0.
-     * @param index An index in the buffer argument table.
      * @param buffer The vertex buffer to be setted in the buffer argument table.
      */
-    virtual void setVertexBuffer(unsigned int index, Buffer* buffer) override;
+    virtual void setVertexBuffer(Buffer* buffer) override;
 
     /**
      * Set unifroms and textures
@@ -194,7 +193,7 @@ class CommandBufferGL final : public CommandBuffer
 
     GLint _defaultFBO = 0;  // The value gets from glGetIntegerv, so need to use GLint
     GLuint _currentFBO = 0;
-    std::vector<BufferGL*> _vertexBuffers;
+    BufferGL* _vertexBuffer;
     ProgramState* _programState = nullptr;
     BufferGL* _indexBuffer = nullptr;
     RenderPipelineGL* _renderPipeline = nullptr;