moves shaders files from 2d/ to renderer/

build/cocos2d_libs.xcodeproj/project.pbxproj

@@ -278,44 +278,6 @@
 		1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; };
 		1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; };
 		1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; };
-		1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; };
-		1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; };
-		1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; };
-		1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; };
-		1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; };
-		1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; };
-		1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; };
-		1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; };
-		1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; };
-		1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; };
-		1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; };
-		1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; };
-		1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; };
-		1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; };
-		1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; };
-		1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; };
-		1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; };
-		1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; };
-		1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; };
-		1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; };
-		1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; };
-		1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; };
-		1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; };
-		1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; };
-		1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; };
-		1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; };
-		1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; };
-		1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; };
-		1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; };
-		1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; };
-		1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; };
-		1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; };
-		1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; };
-		1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; };
-		1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; };
-		1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; };
-		1A570273180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; };
-		1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; };
 		1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; };
 		1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; };
 		1A570280180BCC900088DEC7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570277180BCC900088DEC7 /* CCSprite.h */; };
@@ -449,14 +411,6 @@
 		1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A5703BA180BD2800088DEC7 /* libwebp.a */; };
 		1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052A180BD31F0088DEC7 /* libfreetype.a */; };
 		1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052D180BD3280088DEC7 /* libfreetype.a */; };
-		1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; };
-		1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; };
-		1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; };
-		1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; };
-		1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; };
-		1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; };
-		1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; };
-		1A57053A180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; };
 		1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; };
 		1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; };
 		1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; };
@@ -596,16 +550,6 @@
 		1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; };
 		1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; };
 		1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; };
-		1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; };
-		1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; };
-		1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; };
-		1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; };
-		1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; };
-		1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; };
-		1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; };
-		1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; };
-		1AA95FE618EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; };
-		1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; };
 		1AAF528B180E2ECC000584C8 /* b2BroadPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B61807AF9C005B8026 /* b2BroadPhase.cpp */; };
 		1AAF528C180E2ECC000584C8 /* b2BroadPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168B71807AF9C005B8026 /* b2BroadPhase.h */; };
 		1AAF528D180E2ECC000584C8 /* b2CollideCircle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B81807AF9C005B8026 /* b2CollideCircle.cpp */; };
@@ -1610,14 +1554,74 @@
 		500DC9BD19106E89007B91BF /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9BA19106E89007B91BF /* CCProfiling.cpp */; };
 		500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; };
 		500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; };
-		500DC9E9191BF301007B91BF /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9E3191BF301007B91BF /* CCGLProgramState.h */; };
-		500DC9EA191BF301007B91BF /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9E3191BF301007B91BF /* CCGLProgramState.h */; };
-		500DC9EB191BF301007B91BF /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9E4191BF301007B91BF /* CCGLProgramState.cpp */; };
-		500DC9EC191BF301007B91BF /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9E4191BF301007B91BF /* CCGLProgramState.cpp */; };
 		5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; };
 		5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; };
 		5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; };
 		5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; };
+		5034C9B3191C5D4500CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C993191C5D4500CE6051 /* ccShaders.h */; };
+		5034C9B4191C5D4500CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C993191C5D4500CE6051 /* ccShaders.h */; };
+		5034C9B5191C5D4500CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C994191C5D4500CE6051 /* ccShaders.cpp */; };
+		5034C9B6191C5D4500CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C994191C5D4500CE6051 /* ccShaders.cpp */; };
+		5034C9B7191C5D4500CE6051 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C995191C5D4500CE6051 /* CCShaderCache.h */; };
+		5034C9B8191C5D4500CE6051 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C995191C5D4500CE6051 /* CCShaderCache.h */; };
+		5034C9B9191C5D4500CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C996191C5D4500CE6051 /* CCShaderCache.cpp */; };
+		5034C9BA191C5D4500CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C996191C5D4500CE6051 /* CCShaderCache.cpp */; };
+		5034C9BB191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C997191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; };
+		5034C9BC191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C997191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; };
+		5034C9BD191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C998191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h */; };
+		5034C9BE191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C998191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h */; };
+		5034C9BF191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C999191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; };
+		5034C9C0191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C999191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; };
+		5034C9C1191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99A191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; };
+		5034C9C2191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99A191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; };
+		5034C9C3191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99B191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h */; };
+		5034C9C4191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99B191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h */; };
+		5034C9C5191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99C191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h */; };
+		5034C9C6191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99C191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h */; };
+		5034C9C7191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99D191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h */; };
+		5034C9C8191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99D191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h */; };
+		5034C9C9191C5D4500CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99E191C5D4500CE6051 /* ccShader_PositionTexture_vert.h */; };
+		5034C9CA191C5D4500CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99E191C5D4500CE6051 /* ccShader_PositionTexture_vert.h */; };
+		5034C9CB191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99F191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h */; };
+		5034C9CC191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C99F191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h */; };
+		5034C9CD191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A0191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h */; };
+		5034C9CE191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A0191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h */; };
+		5034C9CF191C5D4500CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A1191C5D4500CE6051 /* ccShader_PositionTexture_frag.h */; };
+		5034C9D0191C5D4500CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A1191C5D4500CE6051 /* ccShader_PositionTexture_frag.h */; };
+		5034C9D1191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; };
+		5034C9D2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; };
+		5034C9D3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; };
+		5034C9D4191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; };
+		5034C9D5191C5D4500CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A4191C5D4500CE6051 /* ccShader_PositionColor_vert.h */; };
+		5034C9D6191C5D4500CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A4191C5D4500CE6051 /* ccShader_PositionColor_vert.h */; };
+		5034C9D7191C5D4500CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A5191C5D4500CE6051 /* ccShader_PositionColor_frag.h */; };
+		5034C9D8191C5D4500CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A5191C5D4500CE6051 /* ccShader_PositionColor_frag.h */; };
+		5034C9D9191C5D4500CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A6191C5D4500CE6051 /* ccShader_Position_uColor_vert.h */; };
+		5034C9DA191C5D4500CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A6191C5D4500CE6051 /* ccShader_Position_uColor_vert.h */; };
+		5034C9DB191C5D4500CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A7191C5D4500CE6051 /* ccShader_Position_uColor_frag.h */; };
+		5034C9DC191C5D4500CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A7191C5D4500CE6051 /* ccShader_Position_uColor_frag.h */; };
+		5034C9DD191C5D4500CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A8191C5D4500CE6051 /* ccShader_Label_vert.h */; };
+		5034C9DE191C5D4500CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A8191C5D4500CE6051 /* ccShader_Label_vert.h */; };
+		5034C9DF191C5D4500CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A9191C5D4500CE6051 /* ccShader_Label_frag_outline.h */; };
+		5034C9E0191C5D4500CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9A9191C5D4500CE6051 /* ccShader_Label_frag_outline.h */; };
+		5034C9E1191C5D4500CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AA191C5D4500CE6051 /* ccShader_Label_frag_normal.h */; };
+		5034C9E2191C5D4500CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AA191C5D4500CE6051 /* ccShader_Label_frag_normal.h */; };
+		5034C9E3191C5D4500CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AB191C5D4500CE6051 /* ccShader_Label_frag_df.h */; };
+		5034C9E4191C5D4500CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AB191C5D4500CE6051 /* ccShader_Label_frag_df.h */; };
+		5034C9E5191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AC191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h */; };
+		5034C9E6191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AC191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h */; };
+		5034C9E7191C5D4500CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AD191C5D4500CE6051 /* ccGLStateCache.h */; };
+		5034C9E8191C5D4500CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AD191C5D4500CE6051 /* ccGLStateCache.h */; };
+		5034C9E9191C5D4500CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9AE191C5D4500CE6051 /* ccGLStateCache.cpp */; };
+		5034C9EA191C5D4500CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9AE191C5D4500CE6051 /* ccGLStateCache.cpp */; };
+		5034C9EB191C5D4500CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AF191C5D4500CE6051 /* CCGLProgramState.h */; };
+		5034C9EC191C5D4500CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9AF191C5D4500CE6051 /* CCGLProgramState.h */; };
+		5034C9ED191C5D4500CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9B0191C5D4500CE6051 /* CCGLProgramState.cpp */; };
+		5034C9EE191C5D4500CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9B0191C5D4500CE6051 /* CCGLProgramState.cpp */; };
+		5034C9EF191C5D4500CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9B1191C5D4500CE6051 /* CCGLProgram.h */; };
+		5034C9F0191C5D4500CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9B1191C5D4500CE6051 /* CCGLProgram.h */; };
+		5034C9F1191C5D4500CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9B2191C5D4500CE6051 /* CCGLProgram.cpp */; };
+		5034C9F2191C5D4500CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9B2191C5D4500CE6051 /* CCGLProgram.cpp */; };
 		50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; };
 		50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; };
 		50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; };
@@ -1692,10 +1696,6 @@
 		50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; };
 		50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; };
 		50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; };
-		A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; };
-		A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; };
-		A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; };
-		A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; };
 		A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04583F0189053B500E32FE8 /* CCGLView.cpp */; };
 		A04583F3189053B500E32FE8 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A04583F1189053B500E32FE8 /* CCGLView.h */; };
 		A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; };
@@ -1968,25 +1968,6 @@
 		1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = "<group>"; };
 		1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = "<group>"; };
 		1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = "<group>"; };
-		1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = "<group>"; };
-		1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = "<group>"; };
-		1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = "<group>"; };
-		1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = "<group>"; };
-		1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = "<group>"; };
-		1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = "<group>"; };
-		1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = "<group>"; };
-		1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = "<group>"; };
-		1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = "<group>"; };
-		1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = "<group>"; };
-		1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = "<group>"; };
-		1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = "<group>"; };
-		1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = "<group>"; };
-		1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = "<group>"; };
-		1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = "<group>"; };
-		1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = "<group>"; };
-		1A570249180BCC6F0088DEC7 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = "<group>"; };
-		1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = "<group>"; };
-		1A57024C180BCC6F0088DEC7 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = "<group>"; };
 		1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = "<group>"; };
 		1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSpriteBatchNode.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
@@ -2059,10 +2040,6 @@
 		1A5703BA180BD2800088DEC7 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebp.a; sourceTree = "<group>"; };
 		1A57052A180BD31F0088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = "<group>"; };
 		1A57052D180BD3280088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = "<group>"; };
-		1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = "<group>"; };
-		1A570530180BD9500088DEC7 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
-		1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = "<group>"; };
-		1A570532180BD9500088DEC7 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = "<group>"; };
 		1A57FFF7180BC5160088DEC7 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = CHANGELOG; path = ../CHANGELOG; sourceTree = "<group>"; };
 		1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionFrame.cpp; sourceTree = "<group>"; };
 		1A8C5949180E930E00EF57C3 /* CCActionFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionFrame.h; sourceTree = "<group>"; };
@@ -2133,11 +2110,6 @@
 		1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = "<group>"; };
 		1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = "<group>"; };
 		1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = "<group>"; };
-		1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = "<group>"; };
-		1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = "<group>"; };
-		1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = "<group>"; };
-		1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = "<group>"; };
-		1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = "<group>"; };
 		1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = "<group>"; };
 		1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = "<group>"; };
 		1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = "<group>"; };
@@ -2696,10 +2668,40 @@
 		500DC9B519106E6D007B91BF /* TransformUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformUtils.h; sourceTree = "<group>"; };
 		500DC9BA19106E89007B91BF /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = "<group>"; };
 		500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = "<group>"; };
-		500DC9E3191BF301007B91BF /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = "<group>"; };
-		500DC9E4191BF301007B91BF /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = "<group>"; };
 		50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = "<group>"; };
 		50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = "<group>"; };
+		5034C993191C5D4500CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = "<group>"; };
+		5034C994191C5D4500CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = "<group>"; };
+		5034C995191C5D4500CE6051 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = "<group>"; };
+		5034C996191C5D4500CE6051 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = "<group>"; };
+		5034C997191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = "<group>"; };
+		5034C998191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = "<group>"; };
+		5034C999191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = "<group>"; };
+		5034C99A191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = "<group>"; };
+		5034C99B191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = "<group>"; };
+		5034C99C191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = "<group>"; };
+		5034C99D191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = "<group>"; };
+		5034C99E191C5D4500CE6051 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = "<group>"; };
+		5034C99F191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = "<group>"; };
+		5034C9A0191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = "<group>"; };
+		5034C9A1191C5D4500CE6051 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = "<group>"; };
+		5034C9A2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = "<group>"; };
+		5034C9A3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = "<group>"; };
+		5034C9A4191C5D4500CE6051 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = "<group>"; };
+		5034C9A5191C5D4500CE6051 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = "<group>"; };
+		5034C9A6191C5D4500CE6051 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = "<group>"; };
+		5034C9A7191C5D4500CE6051 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = "<group>"; };
+		5034C9A8191C5D4500CE6051 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = "<group>"; };
+		5034C9A9191C5D4500CE6051 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = "<group>"; };
+		5034C9AA191C5D4500CE6051 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = "<group>"; };
+		5034C9AB191C5D4500CE6051 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = "<group>"; };
+		5034C9AC191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = "<group>"; };
+		5034C9AD191C5D4500CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = "<group>"; };
+		5034C9AE191C5D4500CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = "<group>"; };
+		5034C9AF191C5D4500CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = "<group>"; };
+		5034C9B0191C5D4500CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = "<group>"; };
+		5034C9B1191C5D4500CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
+		5034C9B2191C5D4500CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = "<group>"; };
 		50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = "<group>"; };
 		50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = "<group>"; };
 		50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = "<group>"; };
@@ -2770,8 +2772,6 @@
 		A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = "<group>"; };
 		A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = "<group>"; };
 		A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = "<group>"; };
-		A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = "<group>"; };
-		A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = "<group>"; };
 		A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3249,45 +3249,6 @@
 			name = "script-support";
 			sourceTree = "<group>";
 		};
-		1A570238180BCC580088DEC7 /* shaders */ = {
-			isa = PBXGroup;
-			children = (
-				500DC9E3191BF301007B91BF /* CCGLProgramState.h */,
-				500DC9E4191BF301007B91BF /* CCGLProgramState.cpp */,
-				1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */,
-				1A570530180BD9500088DEC7 /* CCGLProgram.h */,
-				1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */,
-				1A570532180BD9500088DEC7 /* ccGLStateCache.h */,
-				1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */,
-				1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */,
-				1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */,
-				1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */,
-				1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */,
-				1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */,
-				1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */,
-				1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */,
-				1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */,
-				1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */,
-				1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */,
-				1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */,
-				1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */,
-				1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */,
-				1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */,
-				1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */,
-				1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */,
-				1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */,
-				A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */,
-				A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */,
-				1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */,
-				1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */,
-				1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */,
-				1A570249180BCC6F0088DEC7 /* CCShaderCache.h */,
-				1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */,
-				1A57024C180BCC6F0088DEC7 /* ccShaders.h */,
-			);
-			name = shaders;
-			sourceTree = "<group>";
-		};
 		1A570275180BCC840088DEC7 /* sprite-nodes */ = {
 			isa = PBXGroup;
 			children = (
@@ -4475,7 +4436,6 @@
 				1A570218180BCC000088DEC7 /* particle-nodes */,
 				46A16A5A1807B038005B8026 /* platform */,
 				1A570231180BCC380088DEC7 /* script-support */,
-				1A570238180BCC580088DEC7 /* shaders */,
 				1A570275180BCC840088DEC7 /* sprite-nodes */,
 				1A57029A180BCD4F0088DEC7 /* support */,
 				1A5702BC180BCE0A0088DEC7 /* text-input-node */,
@@ -4649,6 +4609,17 @@
 		500DC89819105D41007B91BF /* renderer */ = {
 			isa = PBXGroup;
 			children = (
+				5034C9F4191C5D6800CE6051 /* Shaders */,
+				5034C993191C5D4500CE6051 /* ccShaders.h */,
+				5034C994191C5D4500CE6051 /* ccShaders.cpp */,
+				5034C995191C5D4500CE6051 /* CCShaderCache.h */,
+				5034C996191C5D4500CE6051 /* CCShaderCache.cpp */,
+				5034C9AD191C5D4500CE6051 /* ccGLStateCache.h */,
+				5034C9AE191C5D4500CE6051 /* ccGLStateCache.cpp */,
+				5034C9AF191C5D4500CE6051 /* CCGLProgramState.h */,
+				5034C9B0191C5D4500CE6051 /* CCGLProgramState.cpp */,
+				5034C9B1191C5D4500CE6051 /* CCGLProgram.h */,
+				5034C9B2191C5D4500CE6051 /* CCGLProgram.cpp */,
 				500DC89919105D41007B91BF /* CCBatchCommand.cpp */,
 				500DC89A19105D41007B91BF /* CCBatchCommand.h */,
 				500DC89B19105D41007B91BF /* CCCustomCommand.cpp */,
@@ -4667,6 +4638,35 @@
 			path = ../cocos/renderer;
 			sourceTree = "<group>";
 		};
+		5034C9F4191C5D6800CE6051 /* Shaders */ = {
+			isa = PBXGroup;
+			children = (
+				5034C997191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */,
+				5034C998191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h */,
+				5034C999191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */,
+				5034C99A191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */,
+				5034C99B191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h */,
+				5034C99C191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h */,
+				5034C99D191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h */,
+				5034C99E191C5D4500CE6051 /* ccShader_PositionTexture_vert.h */,
+				5034C99F191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h */,
+				5034C9A0191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h */,
+				5034C9A1191C5D4500CE6051 /* ccShader_PositionTexture_frag.h */,
+				5034C9A2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h */,
+				5034C9A3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h */,
+				5034C9A4191C5D4500CE6051 /* ccShader_PositionColor_vert.h */,
+				5034C9A5191C5D4500CE6051 /* ccShader_PositionColor_frag.h */,
+				5034C9A6191C5D4500CE6051 /* ccShader_Position_uColor_vert.h */,
+				5034C9A7191C5D4500CE6051 /* ccShader_Position_uColor_frag.h */,
+				5034C9A8191C5D4500CE6051 /* ccShader_Label_vert.h */,
+				5034C9A9191C5D4500CE6051 /* ccShader_Label_frag_outline.h */,
+				5034C9AA191C5D4500CE6051 /* ccShader_Label_frag_normal.h */,
+				5034C9AB191C5D4500CE6051 /* ccShader_Label_frag_df.h */,
+				5034C9AC191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h */,
+			);
+			name = Shaders;
+			sourceTree = "<group>";
+		};
 		50FCEB6818C72017004AD434 /* WidgetReader */ = {
 			isa = PBXGroup;
 			children = (
@@ -4914,9 +4914,11 @@
 				06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */,
 				2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */,
 				1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */,
+				5034C9D3191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */,
 				500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */,
 				500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */,
 				46A170191807CBFC005B8026 /* CCCommon.h in Headers */,
+				5034C9D7191C5D4500CE6051 /* ccShader_PositionColor_frag.h in Headers */,
 				46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */,
 				2905FA4818CF08D100240AA3 /* UIButton.h in Headers */,
 				46A170EB1807CECA005B8026 /* CCPhysicsJoint.h in Headers */,
@@ -4926,18 +4928,22 @@
 				46A170161807CBFC005B8026 /* CCLock.h in Headers */,
 				46A1701C1807CBFC005B8026 /* CCGLViewProtocol.h in Headers */,
 				46A1701E1807CBFC005B8026 /* CCFileUtils.h in Headers */,
+				5034C9E7191C5D4500CE6051 /* ccGLStateCache.h in Headers */,
 				2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */,
 				B37510771823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */,
 				46A1705B1807CC1C005B8026 /* CCPlatformDefine.h in Headers */,
 				46A170EE1807CECA005B8026 /* CCPhysicsShape.h in Headers */,
+				5034C9E5191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h in Headers */,
 				2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */,
 				46A170261807CBFC005B8026 /* CCThread.h in Headers */,
+				5034C9DD191C5D4500CE6051 /* ccShader_Label_vert.h in Headers */,
 				46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */,
 				B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */,
 				2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */,
 				500DC99A19106300007B91BF /* ccTypes.h in Headers */,
 				46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */,
 				500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */,
+				5034C9EB191C5D4500CE6051 /* CCGLProgramState.h in Headers */,
 				46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */,
 				46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */,
 				500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */,
@@ -4949,9 +4955,10 @@
 				1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */,
 				1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */,
 				1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */,
+				5034C9C5191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */,
+				5034C9EF191C5D4500CE6051 /* CCGLProgram.h in Headers */,
 				50FCEBB518C72017004AD434 /* SliderReader.h in Headers */,
 				06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */,
-				A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */,
 				1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */,
 				1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */,
 				500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */,
@@ -4959,7 +4966,7 @@
 				1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
 				1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */,
 				296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */,
-				A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */,
+				5034C9C3191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */,
 				1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */,
 				1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
 				ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */,
@@ -4976,12 +4983,14 @@
 				46C02E0918E91123004B7456 /* xxhash.h in Headers */,
 				B2AF2FA318EBAEAE00C5807C /* Vector2.h in Headers */,
 				06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */,
+				5034C9CD191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */,
 				500DC8B019105D41007B91BF /* CCCustomCommand.h in Headers */,
 				500DC8AC19105D41007B91BF /* CCBatchCommand.h in Headers */,
 				A04583F3189053B500E32FE8 /* CCGLView.h in Headers */,
 				B2AF2FA718EBAEAE00C5807C /* Vector3.h in Headers */,
 				1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */,
 				500DC8D719105F7D007B91BF /* CCGeometry.h in Headers */,
+				5034C9E3191C5D4500CE6051 /* ccShader_Label_frag_df.h in Headers */,
 				500DC96619106300007B91BF /* CCEventListenerAcceleration.h in Headers */,
 				B37510791823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */,
 				1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */,
@@ -4992,6 +5001,7 @@
 				500DC8C619105D41007B91BF /* CCRenderer.h in Headers */,
 				50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */,
 				500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */,
+				5034C9D5191C5D4500CE6051 /* ccShader_PositionColor_vert.h in Headers */,
 				50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */,
 				50E6D33E18E174130051CA34 /* UIVBox.h in Headers */,
 				500DC9AC19106300007B91BF /* ZipUtils.h in Headers */,
@@ -5007,8 +5017,8 @@
 				1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */,
 				500DC93A19106300007B91BF /* CCConfiguration.h in Headers */,
 				1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */,
-				1AA95FE618EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */,
 				1A5701CD180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */,
+				5034C9C9191C5D4500CE6051 /* ccShader_PositionTexture_vert.h in Headers */,
 				1A5701E0180BCB8C0088DEC7 /* CCLayer.h in Headers */,
 				1A5701E4180BCB8C0088DEC7 /* CCScene.h in Headers */,
 				1A01C68818F57BE800EFE3A6 /* CCBool.h in Headers */,
@@ -5017,13 +5027,13 @@
 				2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */,
 				1A5701EC180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */,
 				1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */,
+				5034C9CB191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */,
 				1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */,
 				1A5701FD180BCBAD0088DEC7 /* CCMenuItem.h in Headers */,
 				1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
 				1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */,
 				1A57020A180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */,
 				1A570212180BCBF40088DEC7 /* CCProgressTimer.h in Headers */,
-				500DC9E9191BF301007B91BF /* CCGLProgramState.h in Headers */,
 				1A570216180BCBF40088DEC7 /* CCRenderTexture.h in Headers */,
 				500DC95219106300007B91BF /* CCEventAcceleration.h in Headers */,
 				500DC99E19106300007B91BF /* CCValue.h in Headers */,
@@ -5035,34 +5045,15 @@
 				500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */,
 				B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */,
 				1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */,
-				1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */,
-				1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */,
-				1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */,
 				500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */,
 				2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */,
-				1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */,
 				500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */,
-				1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */,
-				1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */,
-				1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */,
-				1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */,
-				1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */,
 				500DC9A019106300007B91BF /* CCVector.h in Headers */,
-				1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */,
-				1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */,
 				500DC92C19106300007B91BF /* atitc.h in Headers */,
 				1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */,
-				1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */,
 				500DC98419106300007B91BF /* CCMap.h in Headers */,
-				1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */,
-				1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */,
 				2905FA6418CF08D100240AA3 /* UIListView.h in Headers */,
-				1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */,
 				50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */,
-				1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */,
-				1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */,
-				1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */,
-				1A570273180BCC6F0088DEC7 /* ccShaders.h in Headers */,
 				1A570280180BCC900088DEC7 /* CCSprite.h in Headers */,
 				1A570284180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */,
 				500DC9A419106300007B91BF /* etc1.h in Headers */,
@@ -5082,8 +5073,10 @@
 				1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */,
 				1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */,
 				1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */,
+				5034C9C7191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */,
 				1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */,
 				1A5702D9180BCE570088DEC7 /* CCTextureAtlas.h in Headers */,
+				5034C9BD191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */,
 				1A5702DD180BCE570088DEC7 /* CCTextureCache.h in Headers */,
 				1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */,
 				1A5702F0180BCE750088DEC7 /* CCTMXLayer.h in Headers */,
@@ -5096,11 +5089,13 @@
 				1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */,
 				50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */,
 				B37510751823AC9F00B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */,
+				5034C9BF191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */,
 				500DC94619106300007B91BF /* CCDataVisitor.h in Headers */,
 				B2AF2FAB18EBAEAE00C5807C /* Vector4.h in Headers */,
 				1A57031B180BCF430088DEC7 /* ccCArray.h in Headers */,
 				1A57031D180BCF430088DEC7 /* uthash.h in Headers */,
 				1A57031F180BCF430088DEC7 /* utlist.h in Headers */,
+				5034C9CF191C5D4500CE6051 /* ccShader_PositionTexture_frag.h in Headers */,
 				1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */,
 				1A570326180BCF660088DEC7 /* TGAlib.h in Headers */,
 				1A570331180BCFD50088DEC7 /* CCUserDefault.h in Headers */,
@@ -5111,16 +5106,14 @@
 				500DC99619106300007B91BF /* CCScheduler.h in Headers */,
 				1A57035A180BD0B00088DEC7 /* unzip.h in Headers */,
 				296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */,
-				1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */,
-				1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */,
 				500DC98819106300007B91BF /* CCNS.h in Headers */,
-				1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */,
 				1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */,
 				1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */,
 				B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */,
 				2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */,
 				1AD71DB3180E26E600808F54 /* CCBKeyframe.h in Headers */,
 				1AD71DB5180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */,
+				5034C9B3191C5D4500CE6051 /* ccShaders.h in Headers */,
 				1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */,
 				2905FA7E18CF08D100240AA3 /* UIText.h in Headers */,
 				1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */,
@@ -5142,12 +5135,14 @@
 				2905FA5C18CF08D100240AA3 /* UILayoutDefine.h in Headers */,
 				2905FA7218CF08D100240AA3 /* UIScrollInterface.h in Headers */,
 				B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */,
+				5034C9D1191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */,
 				1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */,
 				1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */,
 				2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */,
 				1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */,
 				1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */,
 				1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */,
+				5034C9DB191C5D4500CE6051 /* ccShader_Position_uColor_frag.h in Headers */,
 				1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */,
 				1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */,
 				1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */,
@@ -5160,6 +5155,7 @@
 				1AD71EAB180E26E600808F54 /* Attachment.h in Headers */,
 				500DC97E19106300007B91BF /* CCEventTouch.h in Headers */,
 				50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */,
+				5034C9D9191C5D4500CE6051 /* ccShader_Position_uColor_vert.h in Headers */,
 				1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */,
 				1AD71EB3180E26E600808F54 /* Bone.h in Headers */,
 				2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */,
@@ -5167,6 +5163,7 @@
 				500DC99219106300007B91BF /* CCRefPtr.h in Headers */,
 				1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */,
 				500DC97619106300007B91BF /* CCEventListenerTouch.h in Headers */,
+				5034C9C1191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */,
 				50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */,
 				1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */,
 				2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */,
@@ -5193,7 +5190,9 @@
 				500DC99019106300007B91BF /* CCRef.h in Headers */,
 				1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */,
 				1AAF5374180E3374000584C8 /* SocketIO.h in Headers */,
+				5034C9DF191C5D4500CE6051 /* ccShader_Label_frag_outline.h in Headers */,
 				373B9129187891F400198F86 /* CCComBase.h in Headers */,
+				5034C9BB191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */,
 				1AAF5378180E3374000584C8 /* WebSocket.h in Headers */,
 				1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */,
 				1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */,
@@ -5205,7 +5204,6 @@
 				1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */,
 				B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */,
 				50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */,
-				1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */,
 				1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */,
 				1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */,
 				1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */,
@@ -5224,6 +5222,7 @@
 				1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */,
 				1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */,
 				1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */,
+				5034C9E1191C5D4500CE6051 /* ccShader_Label_frag_normal.h in Headers */,
 				B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */,
 				1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */,
 				1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */,
@@ -5233,6 +5232,7 @@
 				1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */,
 				1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */,
 				1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */,
+				5034C9B7191C5D4500CE6051 /* CCShaderCache.h in Headers */,
 				1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */,
 				1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */,
 				1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */,
@@ -5394,6 +5394,7 @@
 				500DC9B31910633C007B91BF /* CCTouch.h in Headers */,
 				2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */,
 				2AC795E81862875D005EC8E1 /* Event.h in Headers */,
+				5034C9DE191C5D4500CE6051 /* ccShader_Label_vert.h in Headers */,
 				500DC97B19106300007B91BF /* CCEventMouse.h in Headers */,
 				2AC795E91862875D005EC8E1 /* EventData.h in Headers */,
 				2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */,
@@ -5403,6 +5404,7 @@
 				46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */,
 				500DC95719106300007B91BF /* CCEventCustom.h in Headers */,
 				500DC95319106300007B91BF /* CCEventAcceleration.h in Headers */,
+				5034C9C4191C5D4500CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */,
 				B2AF2F9818EBAEAE00C5807C /* MathUtil.h in Headers */,
 				500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */,
 				500DC8D819105F7D007B91BF /* CCGeometry.h in Headers */,
@@ -5416,8 +5418,6 @@
 				46A170451807CC07005B8026 /* CCESRenderer.h in Headers */,
 				46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */,
 				46A170411807CC07005B8026 /* CCGLView.h in Headers */,
-				A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */,
-				1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */,
 				46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */,
 				500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */,
 				500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */,
@@ -5427,6 +5427,7 @@
 				2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */,
 				500DC8BD19105D41007B91BF /* CCQuadCommand.h in Headers */,
 				46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */,
+				5034C9CC191C5D4500CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */,
 				46A170491807CC07005B8026 /* CCStdC.h in Headers */,
 				46A1703B1807CC07005B8026 /* CCApplication.h in Headers */,
 				46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */,
@@ -5436,6 +5437,7 @@
 				46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */,
 				46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */,
 				46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */,
+				5034C9CA191C5D4500CE6051 /* ccShader_PositionTexture_vert.h in Headers */,
 				1A570064180BC5A10088DEC7 /* CCAction.h in Headers */,
 				06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */,
 				500DC9AD19106300007B91BF /* ZipUtils.h in Headers */,
@@ -5465,6 +5467,7 @@
 				2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */,
 				2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */,
 				2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */,
+				5034C9CE191C5D4500CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */,
 				2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */,
 				500DC93119106300007B91BF /* base64.h in Headers */,
 				B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */,
@@ -5478,6 +5481,7 @@
 				1A570122180BC90D0088DEC7 /* CCGrid.h in Headers */,
 				500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */,
 				500DC8C719105D41007B91BF /* CCRenderer.h in Headers */,
+				5034C9E4191C5D4500CE6051 /* ccShader_Label_frag_df.h in Headers */,
 				500DC98519106300007B91BF /* CCMap.h in Headers */,
 				50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */,
 				1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */,
@@ -5495,7 +5499,8 @@
 				1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */,
 				1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */,
 				2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */,
-				1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */,
+				5034C9E8191C5D4500CE6051 /* ccGLStateCache.h in Headers */,
+				5034C9D4191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */,
 				1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */,
 				296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */,
 				50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */,
@@ -5507,7 +5512,9 @@
 				500DC8C119105D41007B91BF /* CCRenderCommand.h in Headers */,
 				1A5701F1180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */,
 				1A5701FA180BCBAD0088DEC7 /* CCMenu.h in Headers */,
+				5034C9DC191C5D4500CE6051 /* ccShader_Position_uColor_frag.h in Headers */,
 				50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */,
+				5034C9D2191C5D4500CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */,
 				1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */,
 				1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
 				1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */,
@@ -5516,42 +5523,28 @@
 				1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */,
 				1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */,
 				500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */,
-				1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */,
 				500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */,
+				5034C9D6191C5D4500CE6051 /* ccShader_PositionColor_vert.h in Headers */,
 				373B912A187891FB00198F86 /* CCComBase.h in Headers */,
 				500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */,
 				1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */,
 				1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */,
+				5034C9BE191C5D4500CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */,
 				1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */,
 				1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */,
-				1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */,
-				1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */,
 				2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */,
-				1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */,
-				1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */,
 				500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */,
-				1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */,
-				1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */,
 				500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */,
 				50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */,
-				1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */,
+				5034C9C6191C5D4500CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */,
 				500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */,
-				1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */,
-				1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */,
-				1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */,
-				1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */,
 				500DC99119106300007B91BF /* CCRef.h in Headers */,
-				1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */,
-				1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */,
-				1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */,
-				1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */,
-				1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */,
-				1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */,
 				1A570281180BCC900088DEC7 /* CCSprite.h in Headers */,
 				1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */,
 				1A570289180BCC900088DEC7 /* CCSpriteFrame.h in Headers */,
 				1A57028D180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */,
 				1A570295180BCCAB0088DEC7 /* CCAnimation.h in Headers */,
+				5034C9E2191C5D4500CE6051 /* ccShader_Label_frag_normal.h in Headers */,
 				1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */,
 				1A5702B2180BCDBC0088DEC7 /* ccUTF8.h in Headers */,
 				1A5702B8180BCDF40088DEC7 /* CCVertex.h in Headers */,
@@ -5565,6 +5558,7 @@
 				500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */,
 				1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */,
 				2905FA7F18CF08D100240AA3 /* UIText.h in Headers */,
+				5034C9D8191C5D4500CE6051 /* ccShader_PositionColor_frag.h in Headers */,
 				1A5702D6180BCE570088DEC7 /* CCTexture2D.h in Headers */,
 				1A5702DA180BCE570088DEC7 /* CCTextureAtlas.h in Headers */,
 				1A5702DE180BCE570088DEC7 /* CCTextureCache.h in Headers */,
@@ -5573,6 +5567,7 @@
 				1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */,
 				1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */,
 				1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */,
+				5034C9E0191C5D4500CE6051 /* ccShader_Label_frag_outline.h in Headers */,
 				500DC9A119106300007B91BF /* CCVector.h in Headers */,
 				1A5702FD180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */,
 				1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */,
@@ -5585,20 +5580,19 @@
 				B2AF2FA818EBAEAE00C5807C /* Vector3.h in Headers */,
 				1A57031E180BCF430088DEC7 /* uthash.h in Headers */,
 				500DC98B19106300007B91BF /* CCPlatformConfig.h in Headers */,
+				5034C9B4191C5D4500CE6051 /* ccShaders.h in Headers */,
 				1A570320180BCF430088DEC7 /* utlist.h in Headers */,
 				50FCEBC618C72017004AD434 /* TextReader.h in Headers */,
+				5034C9D0191C5D4500CE6051 /* ccShader_PositionTexture_frag.h in Headers */,
 				2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */,
 				B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */,
 				1A570327180BCF660088DEC7 /* TGAlib.h in Headers */,
 				1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */,
 				500DC94319106300007B91BF /* CCData.h in Headers */,
-				1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */,
 				1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */,
 				1A570357180BD0B00088DEC7 /* ioapi.h in Headers */,
 				1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */,
 				1A57035B180BD0B00088DEC7 /* unzip.h in Headers */,
-				1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */,
-				1A57053A180BD9500088DEC7 /* ccGLStateCache.h in Headers */,
 				1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */,
 				1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */,
 				1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */,
@@ -5632,15 +5626,20 @@
 				1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */,
 				1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */,
 				1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */,
+				5034C9C8191C5D4500CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */,
 				500DC93719106300007B91BF /* ccConfig.h in Headers */,
+				5034C9BC191C5D4500CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */,
 				1AD71E98180E26E600808F54 /* Animation.h in Headers */,
 				1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */,
 				1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */,
+				5034C9B8191C5D4500CE6051 /* CCShaderCache.h in Headers */,
 				50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */,
+				5034C9EC191C5D4500CE6051 /* CCGLProgramState.h in Headers */,
 				500DC98119106300007B91BF /* CCEventType.h in Headers */,
 				1AD71EA4180E26E600808F54 /* Atlas.h in Headers */,
 				1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */,
 				1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */,
+				5034C9E6191C5D4500CE6051 /* ccShader_Label_frag_df_glow.h in Headers */,
 				1AD71EAC180E26E600808F54 /* Attachment.h in Headers */,
 				500DC94719106300007B91BF /* CCDataVisitor.h in Headers */,
 				2905FA4918CF08D100240AA3 /* UIButton.h in Headers */,
@@ -5667,7 +5666,9 @@
 				1AD71EE4180E26E600808F54 /* SlotData.h in Headers */,
 				1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */,
 				B2AF2F9C18EBAEAE00C5807C /* Matrix.h in Headers */,
+				5034C9C0191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */,
 				1AD71EEA180E26E600808F54 /* spine.h in Headers */,
+				5034C9C2191C5D4500CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */,
 				1AAF536D180E3374000584C8 /* HttpClient.h in Headers */,
 				1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */,
 				1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */,
@@ -5677,11 +5678,10 @@
 				1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */,
 				1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */,
 				1A0DB7321823827C0025743D /* CCGL.h in Headers */,
-				500DC9EA191BF301007B91BF /* CCGLProgramState.h in Headers */,
 				1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */,
 				500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */,
 				1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */,
-				1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */,
+				5034C9DA191C5D4500CE6051 /* ccShader_Position_uColor_vert.h in Headers */,
 				1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */,
 				296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */,
 				1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */,
@@ -5703,6 +5703,7 @@
 				1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */,
 				1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */,
 				500DC9A919106300007B91BF /* s3tc.h in Headers */,
+				5034C9F0191C5D4500CE6051 /* CCGLProgram.h in Headers */,
 				1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */,
 				1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */,
 				1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */,
@@ -5732,7 +5733,6 @@
 				1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */,
 				B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */,
 				500DC94B19106300007B91BF /* CCDirector.h in Headers */,
-				A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */,
 				50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */,
 				1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */,
 				1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */,
@@ -6113,6 +6113,7 @@
 				46A1701D1807CBFC005B8026 /* CCFileUtils.cpp in Sources */,
 				46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */,
 				500DC96C19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */,
+				5034C9B9191C5D4500CE6051 /* CCShaderCache.cpp in Sources */,
 				46A170231807CBFC005B8026 /* CCSAXParser.cpp in Sources */,
 				B2AF2FA918EBAEAE00C5807C /* Vector4.cpp in Sources */,
 				46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */,
@@ -6210,8 +6211,6 @@
 				50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */,
 				500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */,
 				1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */,
-				1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */,
-				1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */,
 				1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */,
 				1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */,
 				1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */,
@@ -6236,16 +6235,17 @@
 				1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */,
 				1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */,
 				500DC97C19106300007B91BF /* CCEventTouch.cpp in Sources */,
+				5034C9B5191C5D4500CE6051 /* ccShaders.cpp in Sources */,
 				1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */,
 				1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */,
 				1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */,
 				1A570300180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */,
+				5034C9ED191C5D4500CE6051 /* CCGLProgramState.cpp in Sources */,
 				1A570305180BCED90088DEC7 /* ccUtils.cpp in Sources */,
 				1A57030C180BCF190088DEC7 /* CCComponent.cpp in Sources */,
 				500DC96019106300007B91BF /* CCEventListener.cpp in Sources */,
 				1A570310180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */,
 				1A570319180BCF430088DEC7 /* ccCArray.cpp in Sources */,
-				500DC9EB191BF301007B91BF /* CCGLProgramState.cpp in Sources */,
 				B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */,
 				1A570324180BCF660088DEC7 /* TGAlib.cpp in Sources */,
 				1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */,
@@ -6257,8 +6257,6 @@
 				1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */,
 				1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */,
 				1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */,
-				1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */,
-				1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */,
 				1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */,
 				500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */,
 				1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */,
@@ -6300,6 +6298,7 @@
 				500DC97419106300007B91BF /* CCEventListenerTouch.cpp in Sources */,
 				1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */,
 				500DC8D119105F7D007B91BF /* CCAffineTransform.cpp in Sources */,
+				5034C9E9191C5D4500CE6051 /* ccGLStateCache.cpp in Sources */,
 				1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */,
 				1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */,
 				1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */,
@@ -6370,6 +6369,7 @@
 				500DC99419106300007B91BF /* CCScheduler.cpp in Sources */,
 				1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */,
 				500DC98E19106300007B91BF /* CCRef.cpp in Sources */,
+				5034C9F1191C5D4500CE6051 /* CCGLProgram.cpp in Sources */,
 				1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */,
 				1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */,
 				1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */,
@@ -6561,6 +6561,7 @@
 				46A170291807CBFE005B8026 /* CCLock.cpp in Sources */,
 				500DC97119106300007B91BF /* CCEventListenerMouse.cpp in Sources */,
 				500DC8AB19105D41007B91BF /* CCBatchCommand.cpp in Sources */,
+				5034C9BA191C5D4500CE6051 /* CCShaderCache.cpp in Sources */,
 				500DC92B19106300007B91BF /* atitc.cpp in Sources */,
 				46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */,
 				46A170391807CBFE005B8026 /* CCThread.cpp in Sources */,
@@ -6639,8 +6640,6 @@
 				2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */,
 				2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */,
 				50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */,
-				1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */,
-				1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */,
 				1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */,
 				500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */,
 				1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */,
@@ -6660,6 +6659,7 @@
 				1A5702D8180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */,
 				1A5702DC180BCE570088DEC7 /* CCTextureCache.cpp in Sources */,
 				1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */,
+				5034C9B6191C5D4500CE6051 /* ccShaders.cpp in Sources */,
 				1A5702EF180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */,
 				1A5702F3180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */,
 				2905FA5B18CF08D100240AA3 /* UILayoutDefine.cpp in Sources */,
@@ -6685,9 +6685,7 @@
 				1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */,
 				1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */,
 				1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */,
-				1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */,
 				500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */,
-				1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */,
 				500DC94D19106300007B91BF /* CCEvent.cpp in Sources */,
 				1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */,
 				1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */,
@@ -6721,6 +6719,7 @@
 				1AD71E96180E26E600808F54 /* Animation.cpp in Sources */,
 				1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */,
 				1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */,
+				5034C9EE191C5D4500CE6051 /* CCGLProgramState.cpp in Sources */,
 				1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */,
 				1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */,
 				1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */,
@@ -6731,7 +6730,6 @@
 				1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */,
 				500DC8D619105F7D007B91BF /* CCGeometry.cpp in Sources */,
 				50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */,
-				500DC9EC191BF301007B91BF /* CCGLProgramState.cpp in Sources */,
 				1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */,
 				1A01C68B18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */,
 				1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */,
@@ -6760,6 +6758,7 @@
 				1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */,
 				500DC93D19106300007B91BF /* CCConsole.cpp in Sources */,
 				1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */,
+				5034C9EA191C5D4500CE6051 /* ccGLStateCache.cpp in Sources */,
 				1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */,
 				1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */,
 				1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */,
@@ -6783,6 +6782,7 @@
 				1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */,
 				500DC98719106300007B91BF /* CCNS.cpp in Sources */,
 				1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */,
+				5034C9F2191C5D4500CE6051 /* CCGLProgram.cpp in Sources */,
 				1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */,
 				1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */,
 				1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */,

cocos/2d/CCAtlasNode.cpp

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #include "2d/CCTextureAtlas.h"
 #include "2d/CCTextureCache.h"
 #include "base/CCDirector.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "math/TransformUtils.h"
 #include "renderer/CCRenderer.h"

cocos/2d/CCClippingNode.cpp

@@ -26,8 +26,8 @@
  */
 
 #include "2d/CCClippingNode.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "2d/CCDrawingPrimitives.h"
 #include "base/CCDirector.h"
 

cocos/2d/CCDrawNode.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "2d/CCDrawNode.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "CCGL.h"
 #include "base/CCEventType.h"
 #include "base/CCConfiguration.h"

cocos/2d/CCDrawingPrimitives.cpp

@@ -45,9 +45,9 @@ THE SOFTWARE.
 #include "base/ccMacros.h"
 #include "CCGL.h"
 #include "base/CCDirector.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "2d/CCActionCatmullRom.h"
 #include "renderer/CCRenderer.h"
 

cocos/2d/CCGrid.cpp

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #include "base/CCDirector.h"
 #include "CCGrabber.h"
 #include "2d/ccUtils.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "CCGL.h"
 #include "renderer/CCRenderer.h"
 #include "math/TransformUtils.h"

cocos/2d/CCLabel.cpp

@@ -27,7 +27,7 @@
 #include "2d/CCFontAtlasCache.h"
 #include "CCLabelTextFormatter.h"
 #include "2d/CCSprite.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "ccUTF8.h"
 #include "2d/CCSpriteFrame.h"
 #include "base/CCDirector.h"

cocos/2d/CCLabelAtlas.cpp

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #include "2d/CCTextureCache.h"
 #include "2d/CCDrawingPrimitives.h"
 #include "base/ccConfig.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "math/TransformUtils.h"
 #include "2d/platform/CCFileUtils.h"

cocos/2d/CCLayer.cpp

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #include "2d/CCLayer.h"
 #include "base/CCDirector.h"
 #include "2d/CCScriptSupport.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "math/TransformUtils.h"
 // extern
 #include "base/CCEventDispatcher.h"

cocos/2d/CCMotionStreak.cpp

@@ -25,9 +25,9 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "2d/CCMotionStreak.h"
 #include "2d/CCTextureCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "2d/CCVertex.h"
 #include "base/ccMacros.h"
 #include "base/CCDirector.h"

cocos/2d/CCNode.cpp

@@ -40,11 +40,11 @@ THE SOFTWARE.
 #include "2d/CCGrid.h"
 #include "2d/CCActionManager.h"
 #include "2d/CCScriptSupport.h"
-#include "2d/CCGLProgram.h"
 #include "2d/CCScene.h"
-#include "2d/CCGLProgramState.h"
 #include "2d/CCComponent.h"
 #include "2d/CCComponentContainer.h"
+#include "renderer/CCGLProgram.h"
+#include "renderer/CCGLProgramState.h"
 #include "math/TransformUtils.h"
 
 #include "deprecated/CCString.h"

cocos/2d/CCNode.h

@@ -30,14 +30,14 @@
 #define __CCNODE_H__
 
 #include "base/ccMacros.h"
-#include "math/CCAffineTransform.h"
-#include "CCGL.h"
-#include "2d/ccGLStateCache.h"
-#include "2d/CCScriptSupport.h"
-#include "2d/CCProtocols.h"
 #include "base/CCEventDispatcher.h"
 #include "base/CCVector.h"
+#include "math/CCAffineTransform.h"
 #include "math/CCMath.h"
+#include "renderer/ccGLStateCache.h"
+#include "2d/CCScriptSupport.h"
+#include "2d/CCProtocols.h"
+#include "CCGL.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCParticleBatchNode.cpp

@@ -35,9 +35,9 @@
 #include "base/ccMacros.h"
 #include "2d/CCGrid.h"
 #include "CCParticleSystem.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/base64.h"
 #include "base/ZipUtils.h"
 #include "2d/platform/CCFileUtils.h"

cocos/2d/CCParticleSystemQuad.cpp

@@ -32,9 +32,9 @@ THE SOFTWARE.
 #include "base/CCDirector.h"
 #include "CCParticleBatchNode.h"
 #include "2d/CCTextureAtlas.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "math/TransformUtils.h"
 #include "base/CCEventType.h"
 #include "base/CCConfiguration.h"

cocos/2d/CCProgressTimer.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 
 #include "base/ccMacros.h"
 #include "2d/CCTextureCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "math/TransformUtils.h"
 #include "2d/CCDrawingPrimitives.h"

cocos/2d/CCRenderTexture.cpp

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #include "2d/CCRenderTexture.h"
 #include "base/CCDirector.h"
 #include "2d/platform/CCImage.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCConfiguration.h"
 #include "2d/ccUtils.h"
 #include "2d/CCTextureCache.h"

cocos/2d/CCSprite.cpp

@@ -33,9 +33,9 @@ THE SOFTWARE.
 #include "2d/CCSpriteFrameCache.h"
 #include "2d/CCTextureCache.h"
 #include "2d/CCDrawingPrimitives.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "2d/CCTexture2D.h"
 #include "base/CCProfiling.h"
 #include "base/CCDirector.h"

cocos/2d/CCSpriteBatchNode.cpp

@@ -32,9 +32,9 @@ THE SOFTWARE.
 #include "2d/CCGrid.h"
 #include "2d/CCDrawingPrimitives.h"
 #include "2d/CCTextureCache.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "math/TransformUtils.h"
 #include "base/CCProfiling.h"

cocos/2d/CCTMXLayer.cpp

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #include "CCTMXTiledMap.h"
 #include "2d/CCSprite.h"
 #include "2d/CCTextureCache.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "2d/ccCArray.h"
 #include "base/CCDirector.h"
 

cocos/2d/CCTexture2D.cpp

@@ -40,9 +40,9 @@ THE SOFTWARE.
 #include "2d/ccUtils.h"
 #include "base/CCPlatformMacros.h"
 #include "base/CCDirector.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "2d/platform/CCDevice.h"
 #include "deprecated/CCString.h"
 

cocos/2d/CCTextureAtlas.cpp

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #include "2d/CCTextureAtlas.h"
 #include "2d/CCTextureCache.h"
 #include "base/ccMacros.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCEventType.h"
 #include "base/CCDirector.h"
 #include "CCGL.h"

cocos/base/CCDirector.cpp

@@ -36,14 +36,14 @@ THE SOFTWARE.
 #include "2d/CCScene.h"
 #include "2d/CCSpriteFrameCache.h"
 #include "2d/platform/CCFileUtils.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "2d/platform/CCImage.h"
 #include "2d/CCActionManager.h"
 #include "2d/CCFontFNT.h"
 #include "2d/CCFontAtlasCache.h"
 #include "2d/CCAnimationCache.h"
 #include "2d/CCUserDefault.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "2d/CCTransition.h"
 #include "2d/CCTextureCache.h"
 #include "2d/CCFontFreeType.h"

cocos/cocos2d.h

@@ -140,6 +140,11 @@ THE SOFTWARE.
 #include "renderer/CCRenderCommand.h"
 #include "renderer/CCRenderCommandPool.h"
 #include "renderer/CCRenderer.h"
+#include "renderer/CCGLProgram.h"
+#include "renderer/CCGLProgramState.h"
+#include "renderer/ccGLStateCache.h"
+#include "renderer/CCShaderCache.h"
+#include "renderer/ccShaders.h"
 
 // physics
 #include "physics/CCPhysicsBody.h"
@@ -219,12 +224,6 @@ THE SOFTWARE.
 // script_support
 #include "2d/CCScriptSupport.h"
 
-// shaders
-#include "2d/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
-#include "2d/CCShaderCache.h"
-#include "2d/ccShaders.h"
-
 // sprite_nodes
 #include "2d/CCAnimation.h"
 #include "2d/CCAnimationCache.h"

cocos/editor-support/cocostudio/CCArmature.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 #include "renderer/CCRenderer.h"
 #include "renderer/CCGroupCommand.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "2d/CCDrawingPrimitives.h"
 #include "base/CCDirector.h"
 

cocos/editor-support/cocostudio/CCBatchNode.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 #include "renderer/CCRenderer.h"
 #include "renderer/CCGroupCommand.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "base/CCDirector.h"
 
 using namespace cocos2d;

cocos/renderer/CCBatchCommand.cpp

@@ -24,7 +24,7 @@
 
 
 #include "renderer/CCBatchCommand.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "2d/CCTextureAtlas.h"
 #include "2d/CCTexture2D.h"
 

cocos/renderer/CCBatchCommand.h

@@ -26,7 +26,7 @@
 #define _CC_BATCHCOMMAND_H_
 
 #include "CCRenderCommand.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "CCRenderCommandPool.h"
 
 NS_CC_BEGIN

cocos/renderer/CCGLProgram.cpp

@@ -27,8 +27,8 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "base/CCDirector.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/ccMacros.h"
 #include "2d/platform/CCFileUtils.h"
 #include "2d/uthash.h"

cocos/renderer/CCGLProgramState.cpp

@@ -26,9 +26,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "2d/CCGLProgramState.h"
+#include "renderer/CCGLProgramState.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 
 NS_CC_BEGIN
 
@@ -96,48 +96,48 @@ void UniformValue::apply()
     }
 }
 
-void UniformValue::setValue(const std::function<void(Uniform*)> callback)
+void UniformValue::setCallback(const std::function<void(Uniform*)> &callback)
 {
     _value.callback = callback;
     _useCallback = true;
 }
 
-void UniformValue::setValue(float value)
+void UniformValue::setFloat(float value)
 {
     CCASSERT (_uniform->type == GL_FLOAT, "");
     _value.floatValue = value;
     _useCallback = false;
 }
 
-void UniformValue::setValue(int value)
+void UniformValue::setInt(int value)
 {
     CCASSERT ((_uniform->type == GL_INT || _uniform->type == GL_SAMPLER_2D), "");
     _value.intValue = value;
     _useCallback = false;
 }
 
-void UniformValue::setValue(const Vector2& value)
+void UniformValue::setVec2(const Vector2& value)
 {
     CCASSERT (_uniform->type == GL_FLOAT_VEC2, "");
     _value.v2Value = value;
     _useCallback = false;
 }
 
-void UniformValue::setValue(const Vector3& value)
+void UniformValue::setVec3(const Vector3& value)
 {
     CCASSERT (_uniform->type == GL_FLOAT_VEC3, "");
     _value.v3Value = value;
     _useCallback = false;
 }
 
-void UniformValue::setValue(const Vector4& value)
+void UniformValue::setVec4(const Vector4& value)
 {
     CCASSERT (_uniform->type == GL_FLOAT_VEC4, "");
     _value.v4Value = value;
     _useCallback = false;
 }
 
-void UniformValue::setValue(const Matrix& value)
+void UniformValue::setMat4(const Matrix& value)
 {
     CCASSERT(_uniform->type == GL_FLOAT_MAT4, "");
     _value.matrixValue = value;
@@ -182,7 +182,7 @@ void VertexAttribValue::apply()
     }
 }
 
-void VertexAttribValue::setCallback(const std::function<void(VertexAttrib*)> callback)
+void VertexAttribValue::setCallback(const std::function<void(VertexAttrib*)> &callback)
 {
     _value.callback = callback;
     _useCallback = true;
@@ -301,7 +301,8 @@ VertexAttribValue* GLProgramState::getVertexAttribValue(const std::string &name)
     return nullptr;
 }
 
-void GLProgramState::setVertexAttribCallback(const std::string &name, const std::function<void(VertexAttrib*)> callback)
+// VertexAttrib Setters
+void GLProgramState::setVertexAttribCallback(const std::string &name, const std::function<void(VertexAttrib*)> &callback)
 {
     VertexAttribValue *v = getVertexAttribValue(name);
     if(v) {
@@ -327,5 +328,56 @@ void GLProgramState::setVertexAttribPointer(const std::string &name, GLint size,
     }
 }
 
+// Uniform Setters
+
+void GLProgramState::setUniformCallback(const std::string &uniformName, const std::function<void(Uniform*)> &callback)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setCallback(callback);
+}
+
+void GLProgramState::setUniformFloat(const std::string &uniformName, float value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setFloat(value);
+}
+
+void GLProgramState::setUniformInt(const std::string &uniformName, int value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setInt(value);
+}
+
+void GLProgramState::setUniformVec2(const std::string &uniformName, const Vector2& value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setVec2(value);
+}
+
+void GLProgramState::setUniformVec3(const std::string &uniformName, const Vector3& value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setVec3(value);
+}
+
+void GLProgramState::setUniformVec4(const std::string &uniformName, const Vector4& value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setVec4(value);
+}
+
+void GLProgramState::setUniformMat4(const std::string &uniformName, const Matrix& value)
+{
+    auto v = getUniformValue(uniformName);
+    CCASSERT(v, "unknown uniform value");
+    v->setMat4(value);
+}
+
 
 NS_CC_END

cocos/renderer/CCGLProgramState.h

@@ -53,13 +53,13 @@ public:
     UniformValue(Uniform *uniform, GLProgram* glprogram);
     ~UniformValue();
 
-	void setValue(float value);
+	void setFloat(float value);
-	void setValue(int value);
+	void setInt(int value);
-	void setValue(const Vector2& value);
+	void setVec2(const Vector2& value);
-	void setValue(const Vector3& value);
+	void setVec3(const Vector3& value);
-	void setValue(const Vector4& value);
+	void setVec4(const Vector4& value);
-	void setValue(const Matrix& value);
+	void setMat4(const Matrix& value);
-    void setValue(const std::function<void(Uniform*)> callback);
+    void setCallback(const std::function<void(Uniform*)> &callback);
 
     void apply();
 
@@ -102,7 +102,7 @@ public:
     ~VertexAttribValue();
 
 	void setPointer(GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLvoid *pointer);
-    void setCallback(const std::function<void(VertexAttrib*)> callback);
+    void setCallback(const std::function<void(VertexAttrib*)> &callback);
     void apply();
 
 protected:
@@ -144,10 +144,16 @@ public:
     void setGLProgram(GLProgram* glprogram);
     GLProgram* getGLProgram() const { return _glprogram; }
 
-    void setVertexAttribCallback(const std::string &name, const std::function<void(VertexAttrib*)> callback);
+    void setVertexAttribCallback(const std::string &name, const std::function<void(VertexAttrib*)> &callback);
     void setVertexAttribPointer(const std::string &name, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLvoid *pointer);
 
-    UniformValue* getUniformValue(const std::string &uniformName);
+    void setUniformFloat(const std::string &uniformName, float value);
+	void setUniformInt(const std::string &uniformName, int value);
+	void setUniformVec2(const std::string &uniformName, const Vector2& value);
+	void setUniformVec3(const std::string &uniformName, const Vector3& value);
+	void setUniformVec4(const std::string &uniformName, const Vector4& value);
+	void setUniformMat4(const std::string &uniformName, const Matrix& value);
+    void setUniformCallback(const std::string &uniformName, const std::function<void(Uniform*)> &callback);
 
 protected:
     GLProgramState();
@@ -155,6 +161,7 @@ protected:
     bool init(GLProgram* program);
     void resetGLProgram();
     VertexAttribValue* getVertexAttribValue(const std::string &attributeName);
+    UniformValue* getUniformValue(const std::string &uniformName);
 
     std::unordered_map<std::string, UniformValue> _uniforms;
     std::unordered_map<std::string, VertexAttribValue> _attributes;

cocos/renderer/CCQuadCommand.cpp

@@ -24,7 +24,7 @@
 
 
 #include "renderer/CCQuadCommand.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "xxhash.h"
 
 NS_CC_BEGIN

cocos/renderer/CCQuadCommand.h

@@ -26,7 +26,7 @@
 #define _CC_QUADCOMMAND_H_
 
 #include "CCRenderCommand.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "CCRenderCommandPool.h"
 
 NS_CC_BEGIN

cocos/renderer/CCRenderer.cpp

@@ -30,8 +30,8 @@
 #include "renderer/CCBatchCommand.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCGroupCommand.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCConfiguration.h"
 #include "base/CCDirector.h"
 #include "base/CCEventDispatcher.h"

cocos/renderer/CCRenderer.h

@@ -28,7 +28,7 @@
 
 #include "base/CCPlatformMacros.h"
 #include "CCRenderCommand.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "CCGL.h"
 #include <vector>
 #include <stack>

cocos/renderer/CCShaderCache.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
+#include "renderer/ccShaders.h"
 #include "base/ccMacros.h"
-#include "2d/ccShaders.h"
 
 NS_CC_BEGIN
 

cocos/renderer/ccGLStateCache.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "2d/ccGLStateCache.h"
+#include "renderer/ccGLStateCache.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "base/CCDirector.h"
 #include "base/ccConfig.h"
 #include "base/CCConfiguration.h"

cocos/renderer/ccShaders.cpp

@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "2d/ccShaders.h"
+#include "renderer/ccShaders.h"
 
 NS_CC_BEGIN
 //

cocos/ui/UILayout.cpp

@@ -25,8 +25,8 @@ THE SOFTWARE.
 #include "ui/UILayout.h"
 #include "ui/UIHelper.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
-#include "2d/CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
-#include "2d/CCShaderCache.h"
+#include "renderer/CCShaderCache.h"
 #include "base/CCDirector.h"
 #include "2d/CCDrawingPrimitives.h"
 #include "renderer/CCRenderer.h"

extensions/GUI/CCControlExtension/CCControlSwitch.cpp

@@ -30,7 +30,7 @@
 #include "2d/CCActionTween.h"
 #include "2d/CCLabel.h"
 #include "2d/CCClippingNode.h"
-#include "2d/ccShaders.h"
+#include "renderer/ccShaders.h"
 #include "2d/CCRenderTexture.h"
 
 NS_CC_EXT_BEGIN

tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp

@@ -142,7 +142,7 @@ bool ShaderNode::initWithVertex(const char *vert, const char *frag)
 
     _time = 0;
     _resolution = Vector2(SIZE_X, SIZE_Y);
-    getGLProgramState()->getUniformValue("resolution")->setValue(_resolution);
+    getGLProgramState()->setUniformVec2("resolution", _resolution);
 
     scheduleUpdate();
 
@@ -171,7 +171,7 @@ void ShaderNode::setPosition(const Vector2 &newPosition)
     Node::setPosition(newPosition);
     auto position = getPosition();
     _center = Vector2(position.x * CC_CONTENT_SCALE_FACTOR(), position.y * CC_CONTENT_SCALE_FACTOR());
-    getGLProgramState()->getUniformValue("center")->setValue(_center);
+    getGLProgramState()->setUniformVec2("center", _center);
 }
 
 void ShaderNode::draw(Renderer *renderer, const Matrix &transform, bool transformUpdated)
@@ -464,7 +464,7 @@ bool SpriteBlur::initWithTexture(Texture2D* texture, const Rect& rect)
         _samplingRadius = 0;
         this->initProgram();
 
-        getGLProgramState()->getUniformValue("onePixelSize")->setValue(_pixelSize);
+        getGLProgramState()->setUniformVec2("onePixelSize", _pixelSize);
 
         return true;
     }
@@ -547,7 +547,7 @@ void SpriteBlur::setBlurSize(float f)
     }
     log("_blurRadius:%d",_blurRadius);
 
-    getGLProgramState()->getUniformValue("gaussianCoefficient")->setValue(Vector4(_samplingRadius, _scale, _cons, _weightSum));
+    getGLProgramState()->setUniformVec4("gaussianCoefficient", Vector4(_samplingRadius, _scale, _cons, _weightSum));
 }
 
 // ShaderBlur

tests/cpp-tests/Classes/ShaderTest/ShaderTest.h

@@ -5,8 +5,6 @@
 #include "extensions/cocos-ext.h"
 #include "../BaseTest.h"
 
-#include "2d/CCGLProgramState.h"
-
 USING_NS_CC_EXT;
 
 class ShaderTestDemo : public BaseTest

tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp

@@ -22,6 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+
 #include "ShaderTest2.h"
 #include "ShaderTest.h"
 #include "../testResource.h"
@@ -297,8 +298,8 @@ void BlurSprite::setCustomUniforms()
     setBlurSize(3.0f);
 
     auto programState = getGLProgramState();
-    programState->getUniformValue("onePixelSize")->setValue(_pixelSize);
+    programState->setUniformVec2("onePixelSize", _pixelSize);
-    programState->getUniformValue("gaussianCoefficient")->setValue(Vector4(_samplingRadius, _scale, _cons, _weightSum));
+    programState->setUniformVec4("gaussianCoefficient", Vector4(_samplingRadius, _scale, _cons, _weightSum));
 }
 
 void BlurSprite::setBlurSize(float f)
@@ -357,7 +358,7 @@ void NoiseSprite::setCustomUniforms()
 {
     _resolution[0] = getTexture()->getContentSizeInPixels().width;
     _resolution[1] = getTexture()->getContentSizeInPixels().height;
-    getGLProgramState()->getUniformValue("resolution")->setValue(Vector2(_resolution[0],_resolution[1]));
+    getGLProgramState()->setUniformVec2("resolution", Vector2(_resolution[0],_resolution[1]));
 }
 
 class EdgeDetectionSprite : public ShaderSprite, public ShaderSpriteCreator<EdgeDetectionSprite>
@@ -384,7 +385,7 @@ void EdgeDetectionSprite::setCustomUniforms()
     _resolution[0] = getContentSize().width;
     _resolution[1] = getContentSize().height;
 
-    programState->getUniformValue("resolution")->setValue(Vector2(_resolution[0], _resolution[1]));
+    programState->setUniformVec2("resolution", Vector2(_resolution[0], _resolution[1]));
 }
 
 class BloomSprite : public ShaderSprite, public ShaderSpriteCreator<BloomSprite>
@@ -432,7 +433,7 @@ void CelShadingSprite::setCustomUniforms()
     _resolution[0] = getContentSize().width;
     _resolution[1] = getContentSize().height;
 
-    programState->getUniformValue("resolution")->setValue(Vector2(_resolution[0], _resolution[1]));
+    programState->setUniformVec2("resolution", Vector2(_resolution[0], _resolution[1]));
 }
 
 class LensFlareSprite : public ShaderSprite, public ShaderSpriteCreator<LensFlareSprite>
@@ -462,8 +463,8 @@ void LensFlareSprite::setCustomUniforms()
     _resolution[0] = getContentSize().width;
     _resolution[1] = getContentSize().height;
 
-    programState->getUniformValue("resolution")->setValue(Vector2(_resolution[0], _resolution[1]));
+    programState->setUniformVec2("resolution", Vector2(_resolution[0], _resolution[1]));
-    programState->getUniformValue("textureResolution")->setValue(Vector2(_textureResolution[0], _textureResolution[1]));
+    programState->setUniformVec2("textureResolution", Vector2(_textureResolution[0], _textureResolution[1]));
 }
 
 NormalSpriteTest::NormalSpriteTest()
@@ -604,9 +605,9 @@ void OutlineSprite::setCustomUniforms()
 
     auto programState = getGLProgramState();
 
-    programState->getUniformValue("u_outlineColor")->setValue(color);
+    programState->setUniformVec3("u_outlineColor", color);
-    programState->getUniformValue("u_radius")->setValue(radius);
+    programState->setUniformFloat("u_radius", radius);
-    programState->getUniformValue("u_threshold")->setValue(threshold);
+    programState->setUniformFloat("u_threshold", threshold);
 }
 
 
@@ -673,8 +674,8 @@ void UniformSprite::draw(Renderer *renderer, const Matrix &transform, bool trans
 void UniformSprite::setCustomUniforms()
 {
     auto glprogramstate = getGLProgramState();
-    glprogramstate->getUniformValue("center")->setValue(Vector2(480,320));
+    glprogramstate->setUniformVec2("center", Vector2(480,320));
-    glprogramstate->getUniformValue("resolution")->setValue(Vector2(256,256));
+    glprogramstate->setUniformVec2("resolution", Vector2(256,256));
 }
 
 void UniformSprite::onDraw(const Matrix &transform, bool transformUpdated)