Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5576 from ricardoquesada/perf_improvement_in_quad_command 

little performance improvement in quad command
This commit is contained in:
Ricardo Quesada 2014-03-05 18:50:54 -08:00
parent 4fe827e46b 273d0d22f1
commit e0030d35b2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCGLProgram.cpp
View File

@ -349,7 +349,7 @@ bool GLProgram::updateUniformLocation(GLint location, const GLvoid* data, unsign
{
return false;
}
bool updated = true;
tHashUniformEntry *element = nullptr;
HASH_FIND_INT(_hashForUniforms, &location, element);

3
cocos/2d/renderer/CCQuadCommand.cpp
View File

@ -104,8 +104,7 @@ void QuadCommand::generateMaterialID()
void QuadCommand::useMaterial() const
{
_shader->use();
_shader->setUniformsForBuiltins();
_shader->setUniformsForBuiltins(_mv);
//Set texture
GL::bindTexture2D(_textureID);