From 4c623f1f5ec6269a197689257307cc59015d6aea Mon Sep 17 00:00:00 2001
From: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri, 9 May 2014 15:14:50 -0700
Subject: [PATCH] compiles and runs on Windows Phone 8

What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
---
 cocos/2d/cocos2d_wp8.vcxproj                  |  42 ++++--
 cocos/2d/cocos2d_wp8.vcxproj.filters          | 132 ++++++++++++++----
 .../platform/winrt/CCPrecompiledShaders.cpp   |   2 +-
 3 files changed, 140 insertions(+), 36 deletions(-)

diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj
index 0168beeb97..62c951f214 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@@ -270,10 +270,16 @@
     <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
     <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
     <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
+    <ClCompile Include="..\renderer\CCGLProgram.cpp" />
+    <ClCompile Include="..\renderer\CCGLProgramState.cpp" />
+    <ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
+    <ClCompile Include="..\renderer\ccGLStateCache.cpp" />
     <ClCompile Include="..\renderer\CCGroupCommand.cpp" />
     <ClCompile Include="..\renderer\CCQuadCommand.cpp" />
     <ClCompile Include="..\renderer\CCRenderCommand.cpp" />
     <ClCompile Include="..\renderer\CCRenderer.cpp" />
+    <ClCompile Include="..\renderer\CCShaderCache.cpp" />
+    <ClCompile Include="..\renderer\ccShaders.cpp" />
     <ClCompile Include="CCAction.cpp" />
     <ClCompile Include="CCActionCamera.cpp" />
     <ClCompile Include="CCActionCatmullRom.cpp" />
@@ -320,8 +326,6 @@
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </ForcedIncludeFiles>
     </ClCompile>
-    <ClCompile Include="CCGLProgram.cpp" />
-    <ClCompile Include="ccGLStateCache.cpp" />
     <ClCompile Include="CCGrabber.cpp" />
     <ClCompile Include="CCGrid.cpp" />
     <ClCompile Include="CCNodeGrid.cpp" />
@@ -345,8 +349,6 @@
     <ClCompile Include="CCRenderTexture.cpp" />
     <ClCompile Include="CCScene.cpp" />
     <ClCompile Include="CCScriptSupport.cpp" />
-    <ClCompile Include="CCShaderCache.cpp" />
-    <ClCompile Include="ccShaders.cpp" />
     <ClCompile Include="CCSprite.cpp" />
     <ClCompile Include="CCSpriteBatchNode.cpp" />
     <ClCompile Include="CCSpriteFrame.cpp" />
@@ -494,11 +496,39 @@
     <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
     <ClInclude Include="..\renderer\CCBatchCommand.h" />
     <ClInclude Include="..\renderer\CCCustomCommand.h" />
+    <ClInclude Include="..\renderer\CCGLProgram.h" />
+    <ClInclude Include="..\renderer\CCGLProgramState.h" />
+    <ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
+    <ClInclude Include="..\renderer\ccGLStateCache.h" />
     <ClInclude Include="..\renderer\CCGroupCommand.h" />
     <ClInclude Include="..\renderer\CCQuadCommand.h" />
     <ClInclude Include="..\renderer\CCRenderCommand.h" />
     <ClInclude Include="..\renderer\CCRenderCommandPool.h" />
     <ClInclude Include="..\renderer\CCRenderer.h" />
+    <ClInclude Include="..\renderer\CCShaderCache.h" />
+    <ClInclude Include="..\renderer\ccShaders.h" />
+    <ClInclude Include="..\renderer\ccShader_Label_frag_df.h" />
+    <ClInclude Include="..\renderer\ccShader_Label_frag_df_glow.h" />
+    <ClInclude Include="..\renderer\ccShader_Label_frag_normal.h" />
+    <ClInclude Include="..\renderer\ccShader_Label_frag_outline.h" />
+    <ClInclude Include="..\renderer\ccShader_Label_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionColorLengthTexture_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionColorLengthTexture_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionColor_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionColor_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureA8Color_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureA8Color_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColorAlphaTest_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_noMVP_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_noMVP_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_uColor_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_uColor_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_vert.h" />
+    <ClInclude Include="..\renderer\ccShader_Position_uColor_frag.h" />
+    <ClInclude Include="..\renderer\ccShader_Position_uColor_vert.h" />
     <ClInclude Include="CCAction.h" />
     <ClInclude Include="CCActionCamera.h" />
     <ClInclude Include="CCActionCatmullRom.h" />
@@ -530,8 +560,6 @@
     <ClInclude Include="CCFontFNT.h" />
     <ClInclude Include="CCFontFreeType.h" />
     <ClInclude Include="ccFPSImages.h" />
-    <ClInclude Include="CCGLProgram.h" />
-    <ClInclude Include="ccGLStateCache.h" />
     <ClInclude Include="CCGrabber.h" />
     <ClInclude Include="CCGrid.h" />
     <ClInclude Include="CCNodeGrid.h" />
@@ -558,8 +586,6 @@
     <ClInclude Include="CCRenderTexture.h" />
     <ClInclude Include="CCScene.h" />
     <ClInclude Include="CCScriptSupport.h" />
-    <ClInclude Include="CCShaderCache.h" />
-    <ClInclude Include="ccShaders.h" />
     <ClInclude Include="CCSprite.h" />
     <ClInclude Include="CCSpriteBatchNode.h" />
     <ClInclude Include="CCSpriteFrame.h" />
diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters
index 2fe7279e70..58d4bf9436 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@@ -58,9 +58,6 @@
     <Filter Include="script_support">
       <UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="shaders">
-      <UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
-    </Filter>
     <Filter Include="draw_nodes">
       <UniqueIdentifier>{1179d205-d065-49f0-8457-bc4c3f1d0cb3}</UniqueIdentifier>
     </Filter>
@@ -103,6 +100,9 @@
     <Filter Include="math">
       <UniqueIdentifier>{9bbf7050-757b-41b1-ab15-418db52c2023}</UniqueIdentifier>
     </Filter>
+    <Filter Include="renderer\Shaders">
+      <UniqueIdentifier>{3237780d-1154-4049-bf53-151c421f26e9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\physics\CCPhysicsBody.cpp">
@@ -276,18 +276,6 @@
     <ClCompile Include="..\base\s3tc.cpp">
       <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="CCGLProgram.cpp">
-      <Filter>shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="ccGLStateCache.cpp">
-      <Filter>shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="CCShaderCache.cpp">
-      <Filter>shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="ccShaders.cpp">
-      <Filter>shaders</Filter>
-    </ClCompile>
     <ClCompile Include="CCSpriteBatchNode.cpp">
       <Filter>sprite_nodes</Filter>
     </ClCompile>
@@ -600,6 +588,24 @@
     <ClCompile Include="..\base\CCEventListenerFocus.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgram.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgramState.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgramStateCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\ccGLStateCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCShaderCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\ccShaders.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -809,18 +815,6 @@
     <ClInclude Include="..\base\s3tc.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCGLProgram.h">
-      <Filter>shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="ccGLStateCache.h">
-      <Filter>shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="CCShaderCache.h">
-      <Filter>shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="ccShaders.h">
-      <Filter>shaders</Filter>
-    </ClInclude>
     <ClInclude Include="CCSpriteBatchNode.h">
       <Filter>sprite_nodes</Filter>
     </ClInclude>
@@ -1186,6 +1180,90 @@
     <ClInclude Include="..\base\CCEventListenerFocus.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgram.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgramState.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgramStateCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccGLStateCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCShaderCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShaders.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Label_frag_df.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Label_frag_df_glow.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Label_frag_normal.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Label_frag_outline.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Label_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Position_uColor_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_Position_uColor_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionColor_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionColor_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionColorLengthTexture_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionColorLengthTexture_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_uColor_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_uColor_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTexture_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureA8Color_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureA8Color_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_noMVP_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_noMVP_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColor_vert.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShader_PositionTextureColorAlphaTest_frag.h">
+      <Filter>renderer\Shaders</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\MathUtil.inl">
diff --git a/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp b/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp
index a1d82a0c01..3ec3131651 100644
--- a/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp
+++ b/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp
@@ -24,7 +24,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "CCPrecompiledShaders.h"
 #include "CCWinRTUtils.h"
-#include "CCGLProgram.h"
+#include "renderer/CCGLProgram.h"
 #include "sha1.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)