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:
@@ -28,9 +28,13 @@ THE SOFTWARE.
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
namespace {
|
||||
GLProgramStateCache::GLProgramStateLifeCycleHook __glProgramStateCreateHook = nullptr;
|
||||
GLProgramStateCache::GLProgramStateLifeCycleHook __glProgramStateDestroyHook = nullptr;
|
||||
}
|
||||
|
||||
GLProgramStateCache* GLProgramStateCache::s_instance = nullptr;
|
||||
|
||||
GLProgramStateCache::GLProgramStateCache()
|
||||
@@ -39,7 +43,7 @@ GLProgramStateCache::GLProgramStateCache()
|
||||
|
||||
GLProgramStateCache::~GLProgramStateCache()
|
||||
{
|
||||
_glProgramStates.clear();
|
||||
removeAllGLProgramState();
|
||||
}
|
||||
|
||||
GLProgramStateCache* GLProgramStateCache::getInstance()
|
||||
@@ -66,6 +70,10 @@ GLProgramState* GLProgramStateCache::getGLProgramState(GLProgram* glprogram)
|
||||
auto ret = new (std::nothrow) GLProgramState;
|
||||
if(ret && ret->init(glprogram)) {
|
||||
_glProgramStates.insert(glprogram, ret);
|
||||
|
||||
if (__glProgramStateCreateHook != nullptr)
|
||||
__glProgramStateCreateHook(this, ret);
|
||||
|
||||
ret->release();
|
||||
return ret;
|
||||
}
|
||||
@@ -81,6 +89,8 @@ void GLProgramStateCache::removeUnusedGLProgramState()
|
||||
if( value->getReferenceCount() == 1 ) {
|
||||
CCLOG("cocos2d: GLProgramStateCache: removing unused GLProgramState");
|
||||
|
||||
if (__glProgramStateDestroyHook != nullptr)
|
||||
__glProgramStateDestroyHook(this, value);
|
||||
//value->release();
|
||||
it = _glProgramStates.erase(it);
|
||||
} else {
|
||||
@@ -91,8 +101,26 @@ void GLProgramStateCache::removeUnusedGLProgramState()
|
||||
|
||||
void GLProgramStateCache::removeAllGLProgramState()
|
||||
{
|
||||
if (__glProgramStateDestroyHook != nullptr)
|
||||
{
|
||||
for (const auto& e : _glProgramStates)
|
||||
__glProgramStateDestroyHook(this, e.second);
|
||||
}
|
||||
|
||||
_glProgramStates.clear();
|
||||
}
|
||||
|
||||
/* static */
|
||||
void GLProgramStateCache::setGLProgramStateCreateHook(GLProgramStateLifeCycleHook hook)
|
||||
{
|
||||
__glProgramStateCreateHook = hook;
|
||||
}
|
||||
|
||||
/* static */
|
||||
void GLProgramStateCache::setGLProgramStateDestroyHook(GLProgramStateLifeCycleHook hook)
|
||||
{
|
||||
__glProgramStateDestroyHook = hook;
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
|
||||
Reference in New Issue
Block a user