From 046494640937fef034e598b920d640dbb52fa062 Mon Sep 17 00:00:00 2001
From: David Ludwig <dludwig@pobox.com>
Date: Sun, 24 Feb 2013 10:11:58 -0500
Subject: [PATCH] WinRT: moved the default vertex shader into the Direct3D 11.1
 renderer's folder

--HG--
rename : src/video/windowsrt/SimpleVertexShader.hlsl => src/render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl
---
 VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj            | 3 +--
 VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters    | 6 +++---
 VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj                  | 5 ++---
 VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters          | 6 +++---
 .../direct3d11/SDL_D3D11_VertexShader_Default.hlsl}         | 0
 src/render/direct3d11/SDL_render_d3d11.cpp                  | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)
 rename src/{video/windowsrt/SimpleVertexShader.hlsl => render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl} (100%)

diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
index 33fcf9856..c8c7e55dd 100644
--- a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
+++ b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
@@ -388,8 +388,7 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
     </FxCompile>
-    <FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
-      <FileType>Document</FileType>
+    <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
index f2b727195..3471b4635 100644
--- a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
+++ b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
@@ -592,14 +592,14 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
-      <Filter>GPU Shaders</Filter>
-    </FxCompile>
     <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl">
       <Filter>GPU Shaders</Filter>
     </FxCompile>
     <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl">
       <Filter>GPU Shaders</Filter>
     </FxCompile>
+    <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
+      <Filter>GPU Shaders</Filter>
+    </FxCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
index afdc18d2c..26489fd08 100644
--- a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
+++ b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
@@ -295,11 +295,10 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
     </FxCompile>
-    <FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
-      <FileType>Document</FileType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
+    <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Vertex</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
index 41ec53576..e8a704b70 100644
--- a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
+++ b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
-      <Filter>GPU Shaders</Filter>
-    </FxCompile>
     <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl">
       <Filter>GPU Shaders</Filter>
     </FxCompile>
     <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl">
       <Filter>GPU Shaders</Filter>
     </FxCompile>
+    <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
+      <Filter>GPU Shaders</Filter>
+    </FxCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\SDL.c">
diff --git a/src/video/windowsrt/SimpleVertexShader.hlsl b/src/render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl
similarity index 100%
rename from src/video/windowsrt/SimpleVertexShader.hlsl
rename to src/render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl
diff --git a/src/render/direct3d11/SDL_render_d3d11.cpp b/src/render/direct3d11/SDL_render_d3d11.cpp
index 52c40583a..289deee26 100644
--- a/src/render/direct3d11/SDL_render_d3d11.cpp
+++ b/src/render/direct3d11/SDL_render_d3d11.cpp
@@ -345,7 +345,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
     // Load in SDL's one and only vertex shader:
     //
     vector<char> fileData;
-    if (!D3D11_ReadShaderContents(L"SimpleVertexShader.cso", fileData)) {
+    if (!D3D11_ReadShaderContents(L"SDL_D3D11_VertexShader_Default.cso", fileData)) {
         SDL_SetError("Unable to open SDL's vertex shader file.");
         return E_FAIL;
     }