Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-25 01:45:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Ludwig
2013-02-24 10:11:58 -05:00
parent dbf571eb99
commit cacc6d9d92
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)'=='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>

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

@@ -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>

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)'=='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>

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

@@ -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">

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:
//
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;
}