pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WinRT: moved the default vertex shader into the Direct3D 11.1 renderer's folder

Browse source 
--HG--
rename : src/video/windowsrt/SimpleVertexShader.hlsl => src/render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl
This commit is contained in:
David Ludwig 2013-02-24 10:11:58 -05:00
parent a53fe847a1
commit 0464946409
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
View file

@ -388,8 +388,7 @@
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
<FileType>Document</FileType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>

6
VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
View file

@ -592,14 +592,14 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
<Filter>GPU Shaders</Filter>
</FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl">
<Filter>GPU Shaders</Filter> <Filter>GPU Shaders</Filter>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl">
<Filter>GPU Shaders</Filter> <Filter>GPU Shaders</Filter>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
<Filter>GPU Shaders</Filter>
</FxCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
View file

@ -295,11 +295,10 @@
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
<FileType>Document</FileType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='Release|Win32'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType> <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>

6
VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<FxCompile Include="..\..\src\video\windowsrt\SimpleVertexShader.hlsl">
<Filter>GPU Shaders</Filter>
</FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_TextureCopy.hlsl">
<Filter>GPU Shaders</Filter> <Filter>GPU Shaders</Filter>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl"> <FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_PixelShader_FixedColor.hlsl">
<Filter>GPU Shaders</Filter> <Filter>GPU Shaders</Filter>
</FxCompile> </FxCompile>
<FxCompile Include="..\..\src\render\direct3d11\SDL_D3D11_VertexShader_Default.hlsl">
<Filter>GPU Shaders</Filter>
</FxCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\SDL.c"> <ClCompile Include="..\..\src\SDL.c">

0
src/video/windowsrt/SimpleVertexShader.hlsl → src/render/direct3d11/SDL_D3D11_VertexShader_Default.hlsl
View file

2
src/render/direct3d11/SDL_render_d3d11.cpp
View file

@ -345,7 +345,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
// Load in SDL's one and only vertex shader: // Load in SDL's one and only vertex shader:
// //
vector<char> fileData; 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."); SDL_SetError("Unable to open SDL's vertex shader file.");
return E_FAIL; return E_FAIL;
} }