Revert "fix crash of cclayercolor and fix some other error logic (cocos2d#19177)"

This reverts commit 30daf5d.

Author: drelaptop

cocos/2d/CCLayer.cpp

@@ -620,13 +620,13 @@ void LayerColor::onDraw(const Mat4& transform, uint32_t /*flags*/)
     getGLProgram()->use();
     getGLProgram()->setUniformsForBuiltins(transform);
 
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
+    
     //
     // Attributes
     //
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
-    glDisableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _noMVPVertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_FLOAT, GL_FALSE, 0, _squareColors);
 

cocos/2d/CCMotionStreak.cpp

@@ -390,12 +390,6 @@ void MotionStreak::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _texture->getName());
-    auto alphaTexID = _texture->getAlphaTextureName();
-    if (alphaTexID > 0)
-    {
-        glActiveTexture(GL_TEXTURE0 + 1);
-        glBindTexture(GL_TEXTURE_2D, alphaTexID);
-    }
 
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, _vertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoords);

cocos/2d/CCProgressTimer.cpp

@@ -517,12 +517,6 @@ void ProgressTimer::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _sprite->getTexture()->getName());
-    auto alphaTexID = _sprite->getTexture()->getAlphaTextureName();
-    if (alphaTexID > 0)
-    {
-        glActiveTexture(GL_TEXTURE0 + 1);
-        glBindTexture(GL_TEXTURE_2D, alphaTexID);
-    }
 
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]) , &_vertexData[0].vertices);
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]), &_vertexData[0].texCoords);

cocos/base/ccUtils.cpp

@@ -544,18 +544,6 @@ void setBlending(GLenum sfactor, GLenum dfactor)
         RenderState::StateBlock::_defaultState->setBlendDst((RenderState::Blend)dfactor);
     }
 }
-    
-void enableVertexAttributes(uint32_t flags)
-{
-    for (int i = 0; flags > 0; i++)
-    {
-        int flag = 1 << i;
-        if (flag & flags)
-            glEnableVertexAttribArray(i);
-        
-        flags &= ~flag;
-    }
-}
 
 }
 

cocos/base/ccUtils.h

@@ -190,7 +190,6 @@ namespace utils
     CC_DLL LanguageType getLanguageTypeByISO2(const char* code);
 
     CC_DLL void setBlending(GLenum sfactor, GLenum dfactor);
-    CC_DLL void enableVertexAttributes(uint32_t flags);
 }
 
 NS_CC_END

cocos/renderer/CCTextureAtlas.cpp

@@ -614,12 +614,6 @@ void TextureAtlas::drawNumberOfQuads(ssize_t numberOfQuads, ssize_t start)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _texture->getName());
-    auto alphaTexID = _texture->getAlphaTextureName();
-    if (alphaTexID > 0)
-    {
-        glActiveTexture(GL_TEXTURE0 + 1);
-        glBindTexture(GL_TEXTURE_2D, alphaTexID);
-    }
 
     auto conf = Configuration::getInstance();
     if (conf->supportsShareableVAO() && conf->supportsMapBuffer())

cocos/renderer/CCVertexAttribBinding.cpp

@@ -25,7 +25,6 @@
 #include "platform/CCGL.h"
 #include "base/CCConfiguration.h"
 #include "3d/CCMeshVertexIndexData.h"
-#include "base/ccUtils.h"
 
 NS_CC_BEGIN
 
@@ -148,7 +147,7 @@ bool VertexAttribBinding::init(MeshIndexData* meshIndexData, GLProgramState* glP
         glBindVertexArray(_handle);
         glBindBuffer(GL_ARRAY_BUFFER, meshVertexData->getVertexBuffer()->getVBO());
 
-        utils::enableVertexAttributes(_vertexAttribsFlags);
+        enableVertexAttributes(_vertexAttribsFlags);
 
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, meshIndexData->getIndexBuffer()->getVBO());
 
@@ -181,7 +180,7 @@ void VertexAttribBinding::bind()
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _meshIndexData->getIndexBuffer()->getVBO());
 
         // Software mode
-        utils::enableVertexAttributes(_vertexAttribsFlags);
+        enableVertexAttributes(_vertexAttribsFlags);
         // set attributes
         for(auto &attribute : _attributes)
         {
@@ -227,6 +226,19 @@ void VertexAttribBinding::parseAttributes()
     }
 }
 
+void VertexAttribBinding::enableVertexAttributes(uint32_t flags) const
+{
+    auto tmpFlags = flags;
+    for (int i = 0; tmpFlags > 0; i++)
+    {
+        int flag = 1 << i;
+        if (flag & tmpFlags)
+            glEnableVertexAttribArray(i);
+        
+        tmpFlags &= ~flag;
+    }
+}
+
 VertexAttribValue* VertexAttribBinding::getVertexAttribValue(const std::string& name)
 {
     const auto itr = _attributes.find(name);

cocos/renderer/CCVertexAttribBinding.h

@@ -108,6 +108,8 @@ class CC_DLL VertexAttribBinding : public Ref
     void setVertexAttribPointer(const std::string& name, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLvoid* pointer);
     VertexAttribValue* getVertexAttribValue(const std::string &name);
     void parseAttributes();
+    void enableVertexAttributes(uint32_t flags) const;
+
 
     GLuint _handle;
 

cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp

@@ -36,7 +36,6 @@
 #include "2d/CCDrawingPrimitives.h"
 #include "renderer/CCRenderer.h"
 #include "platform/CCGL.h"
-#include "base/ccUtils.h"
 
 using namespace cocos2d;
 
@@ -4406,7 +4405,7 @@ static int tolua_Cocos2d_glEnableVertexAttribs00(lua_State* tolua_S)
 #endif
     {
         int arg0 = (int)tolua_tonumber(tolua_S, 1, 0);
-        cocos2d::utils::enableVertexAttributes(arg0);
+        glEnableVertexAttribArray(arg0);
     }
     return 0;
 #ifndef TOLUA_RELEASE

tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp

@@ -224,7 +224,7 @@ void DrawNode3D::onDraw(const Mat4 &transform, uint32_t flags)
     glProgram->use();
     glProgram->setUniformsForBuiltins(transform);
     glEnable(GL_DEPTH_TEST);
-    cocos2d::utils::setBlending(_blendFunc.src, _blendFunc.dst);
+    glBlendFunc(_blendFunc.src, _blendFunc.dst);
 
     if (_dirty)
     {