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

android rename ShaderCahe to GLProgramCache

This commit is contained in:
yangxiao 2014-05-09 19:05:39 -07:00
parent 63c7c6a05c
commit d46729862c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/platform/android/javaactivity.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "CCEventCustom.h"
#include "CCEventType.h"
#include "CCGLView.h"
#include "CCShaderCache.h"
#include "CCGLProgramCache.h"
#include "CCTextureCache.h"
#include "platform/android/jni/JniHelper.h"
#include <android/log.h>
@ -68,7 +68,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
else
{
cocos2d::GL::invalidateStateCache();
cocos2d::ShaderCache::getInstance()->reloadDefaultShaders();
cocos2d::GLProgramCache::getInstance()->reloadDefaultGLPrograms();
cocos2d::DrawPrimitives::init();
cocos2d::VolatileTextureMgr::reloadAllTextures();

2
cocos/Android.mk
View File

@ -141,7 +141,7 @@ renderer/CCGroupCommand.cpp \
renderer/CCQuadCommand.cpp \
renderer/CCRenderCommand.cpp \
renderer/CCRenderer.cpp \
renderer/CCShaderCache.cpp \
renderer/CCGLProgramCache.cpp \
renderer/CCShaders.cpp \
deprecated/CCArray.cpp \
deprecated/CCSet.cpp \