Merge pull request #8921 from TimothyZhang/fix-program-cache-add

release old program with the same key before adding glprogram
2014-10-27 11:22:00 +08:00 · 2014-10-27 11:22:00 +08:00 · f1ac0df761
parent b3ade76650 d42f8cac65
commit f1ac0df761
1 changed files with 9 additions and 2 deletions
--- a/cocos/renderer/CCGLProgramCache.cpp
+++ b/cocos/renderer/CCGLProgramCache.cpp
@ -432,9 +432,16 @@ GLProgram* GLProgramCache::getGLProgram(const std::string &key)

 void GLProgramCache::addGLProgram(GLProgram* program, const std::string &key)
 {
+    // release old one
+    auto prev = getProgram(key);
+    if( prev == program )
+        return;
+
+    _programs.erase(key);
+    CC_SAFE_RELEASE_NULL(prev);
+
    if (program)
        program->retain();    
-    
    _programs[key] = program;
 }