remove arrays of vertex layout (#20023)

Author: Mee-gu

cocos/renderer/CCRenderer.cpp

@@ -785,26 +785,20 @@ backend::RenderPipeline* Renderer::getRenderPipeline(const backend::RenderPipeli
     hashMe.sourceAlphaBlendFactor = (unsigned int)blendDescriptor.sourceAlphaBlendFactor;
     hashMe.destinationAlphaBlendFactor = (unsigned int)blendDescriptor.destinationAlphaBlendFactor;
     int index = 0;
-    for(const auto& vertexLayout : *renderPipelineDescriptor.vertexLayouts)
+    const auto& attributes = renderPipelineDescriptor.vertexLayout.getAttributes();
+    for (const auto& it : attributes)
     {
-        if (!vertexLayout.isValid())
-            continue;
-        
-        const auto& attributes = vertexLayout.getAttributes();
-        for (const auto& it : attributes)
-        {
-            auto &attribute = it.second;
-            /*
-             stepFunction:1     stride:15       offest:10       format:5        needNormalized:1
-                bit31           bit30 ~ bit16   bit15 ~ bit6    bit5 ~ bit1     bit0
-             */
-            hashMe.vertexLayoutInfo[index++] =
-                ((unsigned int)vertexLayout.getVertexStepMode() & 0x1) << 31 |
-                ((unsigned int)(vertexLayout.getStride() & 0x7FFF)) << 16 |
-                ((unsigned int)attribute.offset & 0x3FF) << 6 |
-                ((unsigned int)attribute.format & 0x1F) << 1 |
-                ((unsigned int)attribute.needToBeNormallized & 0x1);
-        }
+        auto &attribute = it.second;
+        /*
+            stepFunction:1     stride:15       offest:10       format:5        needNormalized:1
+            bit31           bit30 ~ bit16   bit15 ~ bit6    bit5 ~ bit1     bit0
+            */
+        hashMe.vertexLayoutInfo[index++] =
+            ((unsigned int)renderPipelineDescriptor.vertexLayout.getVertexStepMode() & 0x1) << 31 |
+            ((unsigned int)(renderPipelineDescriptor.vertexLayout.getStride() & 0x7FFF)) << 16 |
+            ((unsigned int)attribute.offset & 0x3FF) << 6 |
+            ((unsigned int)attribute.format & 0x1F) << 1 |
+            ((unsigned int)attribute.needToBeNormallized & 0x1);
     }
 
     unsigned int hash = XXH32((const void*)&hashMe, sizeof(hashMe), 0);
@@ -825,7 +819,7 @@ void Renderer::setRenderPipeline(const PipelineDescriptor& pipelineDescriptor, c
 {
     backend::RenderPipelineDescriptor renderPipelineDescriptor;
     renderPipelineDescriptor.programState = pipelineDescriptor.programState;
-    renderPipelineDescriptor.vertexLayouts->push_back(pipelineDescriptor.vertexLayout);
+    renderPipelineDescriptor.vertexLayout = pipelineDescriptor.vertexLayout;
 
     auto device = backend::Device::getInstance();
     auto blendState = device->createBlendState(pipelineDescriptor.blendDescriptor);
@@ -867,7 +861,7 @@ void Renderer::setRenderPipeline(const PipelineDescriptor& pipelineDescriptor, c
     _commandBuffer->setDepthStencilState(depthStencilState);
 #ifndef CC_USE_METAL
     // Extra layout info is required in OpenGL, which can not be quried from ProgramGL
-    _commandBuffer->updateVertexLayouts(renderPipelineDescriptor.vertexLayouts);
+    _commandBuffer->updateVertexLayout(renderPipelineDescriptor.vertexLayout);
 #endif
 }
 

cocos/renderer/backend/CommandBuffer.h

@@ -188,20 +188,20 @@ class CommandBuffer : public cocos2d::Ref
      * Get vertex layout.
      * @return A vector of vertex layout.
      */
-    inline const std::shared_ptr<std::vector<VertexLayout>>& getVertexLayouts() const { return _vertexLayouts; }
+    inline const VertexLayout& getVertexLayout() const { return _vertexLayout; }
 
     /**
      * Update vertex layoutjj.
      * @param layout Specifies the vertex layout.
      */
-    void updateVertexLayouts(const std::shared_ptr<std::vector<VertexLayout>> &layout) { _vertexLayouts = layout; }
+    void updateVertexLayout(const VertexLayout &layout) { _vertexLayout = layout; }
 
 protected:
     virtual ~CommandBuffer() = default;
 
     unsigned int _stencilReferenceValueFront = 0; ///< front stencil reference value.
     unsigned int _stencilReferenceValueBack = 0; ///< back stencil reference value.
-    std::shared_ptr<std::vector<VertexLayout>> _vertexLayouts; ///< vertex layout.
+    VertexLayout _vertexLayout; ///< vertex layout.
 };
 
 // end of _backend group

cocos/renderer/backend/RenderPipelineDescriptor.h

@@ -48,7 +48,7 @@ struct RenderPipelineDescriptor
 {
     ProgramState* programState = nullptr;
     BlendState* blendState = nullptr;
-    std::shared_ptr<std::vector<VertexLayout>> vertexLayouts = std::make_shared<std::vector<VertexLayout>>();
+    VertexLayout vertexLayout;
     PixelFormat colorAttachmentsFormat[MAX_COLOR_ATTCHMENT] = { PixelFormat::DEFAULT };
     PixelFormat depthAttachmentFormat = PixelFormat::NONE;
     PixelFormat stencilAttachmentFormat = PixelFormat::NONE;

cocos/renderer/backend/metal/RenderPipelineMTL.mm

@@ -119,28 +119,24 @@ MTLVertexFormat toMTLVertexFormat(VertexFormat vertexFormat, bool needNormalize)
 
 void RenderPipelineMTL::setVertexLayout(MTLRenderPipelineDescriptor* mtlDescriptor, const RenderPipelineDescriptor& descriptor)
 {
-    const auto& vertexLayouts = *descriptor.vertexLayouts;
     int vertexIndex = 0;
-    for (const auto& vertexLayout : vertexLayouts)
+    
+    if (!descriptor.vertexLayout.isValid())
+        return;
+    
+    mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stride = descriptor.vertexLayout.getStride();
+    mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stepFunction = toMTLVertexStepFunction(descriptor.vertexLayout.getVertexStepMode());
+    
+    const auto& attributes = descriptor.vertexLayout.getAttributes();
+    for (const auto& it : attributes)
     {
-        if (!vertexLayout.isValid())
-            continue;
-        
-        mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stride = vertexLayout.getStride();
-        mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stepFunction = toMTLVertexStepFunction(vertexLayout.getVertexStepMode());
-        
-        const auto& attributes = vertexLayout.getAttributes();
-        for (const auto& it : attributes)
-        {
-            auto attribute = it.second;
-            mtlDescriptor.vertexDescriptor.attributes[attribute.index].format = toMTLVertexFormat(attribute.format, attribute.needToBeNormallized);
-            mtlDescriptor.vertexDescriptor.attributes[attribute.index].offset = attribute.offset;
-            // Buffer index will always be 0;
-            mtlDescriptor.vertexDescriptor.attributes[attribute.index].bufferIndex = 0;
-        }
-        
-        ++vertexIndex;
+        auto attribute = it.second;
+        mtlDescriptor.vertexDescriptor.attributes[attribute.index].format = toMTLVertexFormat(attribute.format, attribute.needToBeNormallized);
+        mtlDescriptor.vertexDescriptor.attributes[attribute.index].offset = attribute.offset;
+        // Buffer index will always be 0;
+        mtlDescriptor.vertexDescriptor.attributes[attribute.index].bufferIndex = 0;
     }
+     
 }
 
 void RenderPipelineMTL::setBlendState(MTLRenderPipelineColorAttachmentDescriptor* colorAttachmentDescriptor)

cocos/renderer/backend/opengl/CommandBufferGL.cpp

@@ -414,21 +414,17 @@ void CommandBufferGL::bindVertexBuffer(ProgramGL *program) const
     // Bind vertex buffers and set the attributes.
     int i = 0;
     const auto& attributeInfos = program->getAttributeInfos();
-    const auto& vertexLayouts = getVertexLayouts();
-    
+    const auto& vertexLayout = getVertexLayout();
     glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer->getHandler());
-
-    const auto& attributeInfo = attributeInfos[i];
-    const auto &layouts = vertexLayouts->at(i);
-    for (const auto& attribute : attributeInfo)
+    for (const auto& attribute : attributeInfos)
     {
-        const auto &layoutInfo = layouts.getAttributes().at(attribute.name);
+        const auto &layoutInfo = vertexLayout.getAttributes().at(attribute.name);
         glEnableVertexAttribArray(attribute.location);
         glVertexAttribPointer(attribute.location,
             UtilsGL::getGLAttributeSize(layoutInfo.format),
             UtilsGL::toGLAttributeType(layoutInfo.format),
             layoutInfo.needToBeNormallized,
-            layouts.getStride(),
+            vertexLayout.getStride(),
             (GLvoid*)layoutInfo.offset);
     }
 

cocos/renderer/backend/opengl/ProgramGL.cpp

@@ -185,34 +185,27 @@ void ProgramGL::computeLocations()
 void ProgramGL::computeAttributeInfos(const RenderPipelineDescriptor& descriptor)
 {
     _attributeInfos.clear();
-    const auto& vertexLayouts = descriptor.vertexLayouts;
-    for (const auto& vertexLayout : *vertexLayouts)
+    
+    if (! descriptor.vertexLayout.isValid())
+        return;
+    
+    const auto& attributes = descriptor.vertexLayout.getAttributes();
+    for (const auto& it : attributes)
     {
-        if (! vertexLayout.isValid())
-            continue;
+        auto &attribute = it.second;
+        AttributeInfo attributeInfo;
 
-        VertexAttributeArray vertexAttributeArray;
-        
-        const auto& attributes = vertexLayout.getAttributes();
-        for (const auto& it : attributes)
-        {
-            auto &attribute = it.second;
-            AttributeInfo attributeInfo;
-            
-            if (!getAttributeLocation(attribute.name, attributeInfo.location))
-                continue;
-            
-            attributeInfo.stride = vertexLayout.getStride();
-            attributeInfo.offset = attribute.offset;
-            attributeInfo.type = UtilsGL::toGLAttributeType(attribute.format);
-            attributeInfo.size = UtilsGL::getGLAttributeSize(attribute.format);
-            attributeInfo.needToBeNormallized = attribute.needToBeNormallized;
-            attributeInfo.name = attribute.name;
-
-            vertexAttributeArray.push_back(attributeInfo);
-        }
+        if (!getAttributeLocation(attribute.name, attributeInfo.location))
+            continue;
 
-        _attributeInfos.push_back(std::move(vertexAttributeArray));
+        attributeInfo.stride = descriptor.vertexLayout.getStride();
+        attributeInfo.offset = attribute.offset;
+        attributeInfo.type = UtilsGL::toGLAttributeType(attribute.format);
+        attributeInfo.size = UtilsGL::getGLAttributeSize(attribute.format);
+        attributeInfo.needToBeNormallized = attribute.needToBeNormallized;
+        attributeInfo.name = attribute.name;
+
+        _attributeInfos.emplace_back(std::move(attributeInfo));
     }
 }
 

cocos/renderer/backend/opengl/ProgramGL.h

@@ -65,8 +65,6 @@ struct AttributeInfo
 class ProgramGL : public Program
 {
 public:
-    typedef std::vector<AttributeInfo> VertexAttributeArray;
-    
     /**
      * @param vertexShader Specifes the vertex shader source.
      * @param fragmentShader Specifes the fragment shader source.
@@ -79,7 +77,7 @@ class ProgramGL : public Program
      * Get attribute informations.
      * @return Attribute informations.
      */
-    inline const std::vector<VertexAttributeArray>& getAttributeInfos() const { return _attributeInfos; }
+    inline const std::vector<AttributeInfo>& getAttributeInfos() const { return _attributeInfos; }
 
     /**
      * Get program object.
@@ -175,7 +173,7 @@ class ProgramGL : public Program
     ShaderModuleGL* _vertexShaderModule = nullptr;
     ShaderModuleGL* _fragmentShaderModule = nullptr;
 
-    std::vector<VertexAttributeArray> _attributeInfos;
+    std::vector<AttributeInfo> _attributeInfos;
     std::unordered_map<std::string, UniformInfo> _activeUniformInfos;
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     std::unordered_map<std::string, int> _originalUniformLocations; ///< record the uniform location when shader was first created.