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

remove WP8 code which is added by accident when resolve merge conflicts

This commit is contained in:
Huabing.Xu 2015-05-15 10:06:44 +08:00
parent c994f28914
commit fbe49f538d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/renderer/CCGLProgramCache.cpp
View File

@ -63,9 +63,6 @@ enum {
kShaderType_3DSkyBox,
kShaderType_3DTerrain,
kShaderType_CameraClear,
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || defined(WP8_SHADER_COMPILER)
kShaderType_PositionColor_noMVP_GrayScale,
#endif
kShaderType_MAX,
};
@ -498,11 +495,6 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
case kShaderType_CameraClear:
p->initWithByteArrays(ccCameraClearVert, ccCameraClearFrag);
break;
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || defined(WP8_SHADER_COMPILER)
case kShaderType_PositionColor_noMVP_GrayScale:
p->initWithByteArrays(ccPositionTextureColor_noMVP_vert, ccUIGrayScale_frag);
break;
#endif
default:
CCLOG("cocos2d: %s:%d, error shader type", __FUNCTION__, __LINE__);
return;