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

Merge pull request #9931 from dabingnn/v3_fixGL_Invalid_value 

refresh attributes and uniforms in glprogramstate
This commit is contained in:
minggo 2015-01-12 19:33:04 +08:00
parent 4f4d49ef79 d5416d8a7a
commit 731e6b179d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/renderer/CCGLProgramState.cpp
View File

@ -375,6 +375,7 @@ void GLProgramState::applyAttributes(bool applyAttribFlags)
{ {
// Don't set attributes if they weren't set // Don't set attributes if they weren't set
// Use Case: Auto-batching // Use Case: Auto-batching
updateUniformsAndAttributes();
if(_vertexAttribsFlags) { if(_vertexAttribsFlags) {
// enable/disable vertex attribs // enable/disable vertex attribs
if (applyAttribFlags) if (applyAttribFlags)
@ -389,6 +390,7 @@ void GLProgramState::applyAttributes(bool applyAttribFlags)
void GLProgramState::applyUniforms() void GLProgramState::applyUniforms()
{ {
// set uniforms // set uniforms
updateUniformsAndAttributes();
for(auto& uniform : _uniforms) { for(auto& uniform : _uniforms) {
uniform.second.apply(); uniform.second.apply();
} }