mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Merge branch 'v1.8' into develop
# Conflicts: # cocos/scripting/js-bindings/script/jsb_cocos2d.js
This commit is contained in:
@@ -38,6 +38,11 @@ THE SOFTWARE.
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
namespace {
|
||||
GLProgramCache::GLProgramLifeCycleHook __glProgramCreateHook = nullptr;
|
||||
GLProgramCache::GLProgramLifeCycleHook __glProgramDestroyHook = nullptr;
|
||||
}
|
||||
|
||||
enum {
|
||||
kShaderType_PositionTextureColor,
|
||||
kShaderType_PositionTextureColor_noMVP,
|
||||
@@ -77,6 +82,8 @@ GLProgramCache* GLProgramCache::getInstance()
|
||||
|
||||
void GLProgramCache::destroyInstance()
|
||||
{
|
||||
if (_sharedGLProgramCache != nullptr)
|
||||
_sharedGLProgramCache->cleanup();
|
||||
CC_SAFE_RELEASE_NULL(_sharedGLProgramCache);
|
||||
}
|
||||
|
||||
@@ -88,11 +95,8 @@ GLProgramCache::GLProgramCache()
|
||||
|
||||
GLProgramCache::~GLProgramCache()
|
||||
{
|
||||
for( auto it = _programs.begin(); it != _programs.end(); ++it ) {
|
||||
(it->second)->release();
|
||||
}
|
||||
|
||||
CCLOGINFO("deallocing GLProgramCache: %p", this);
|
||||
cleanup();
|
||||
}
|
||||
|
||||
bool GLProgramCache::init()
|
||||
@@ -108,6 +112,18 @@ bool GLProgramCache::init()
|
||||
return true;
|
||||
}
|
||||
|
||||
void GLProgramCache::cleanup()
|
||||
{
|
||||
for(auto& e : _programs)
|
||||
{
|
||||
if (__glProgramDestroyHook != nullptr)
|
||||
__glProgramDestroyHook(this, e.second);
|
||||
|
||||
e.second->release();
|
||||
}
|
||||
_programs.clear();
|
||||
}
|
||||
|
||||
void GLProgramCache::loadDefaultGLPrograms()
|
||||
{
|
||||
// Position Texture Color shader
|
||||
@@ -409,11 +425,18 @@ void GLProgramCache::addGLProgram(GLProgram* program, const std::string &key)
|
||||
if( prev == program )
|
||||
return;
|
||||
|
||||
if (__glProgramDestroyHook != nullptr)
|
||||
__glProgramDestroyHook(this, prev);
|
||||
|
||||
_programs.erase(key);
|
||||
CC_SAFE_RELEASE_NULL(prev);
|
||||
|
||||
if (program)
|
||||
program->retain();
|
||||
|
||||
if (__glProgramCreateHook != nullptr)
|
||||
__glProgramCreateHook(this, program);
|
||||
|
||||
_programs[key] = program;
|
||||
}
|
||||
|
||||
@@ -431,4 +454,25 @@ std::string GLProgramCache::getShaderMacrosForLight() const
|
||||
return std::string(def);
|
||||
}
|
||||
|
||||
/* static */
|
||||
void GLProgramCache::setGLProgramCreateHook(GLProgramLifeCycleHook hook)
|
||||
{
|
||||
__glProgramCreateHook = hook;
|
||||
}
|
||||
|
||||
/* static */
|
||||
void GLProgramCache::setGLProgramDestroyHook(GLProgramLifeCycleHook hook)
|
||||
{
|
||||
__glProgramDestroyHook = hook;
|
||||
}
|
||||
|
||||
void GLProgramCache::notifyAllGLProgramsCreated()
|
||||
{
|
||||
if (__glProgramCreateHook != nullptr)
|
||||
{
|
||||
for (const auto& e : _programs)
|
||||
__glProgramCreateHook(this, e.second);
|
||||
}
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
Reference in New Issue
Block a user