libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

(360) No longer need to deploy the shaders dir

Browse Source
This commit is contained in:
twinaphex 2013-04-12 18:20:08 +02:00
parent e3893229d9
commit 52a9a3d10a
3 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
gfx/shader_hlsl.c
View File

@ -20,46 +20,46 @@
#endif
static const char *stock_hlsl_program =
"void main_vertex"
"("
" float4 position : POSITION,"
" float4 color : COLOR,"
""
" uniform float4x4 modelViewProj,"
""
" float4 texCoord : TEXCOORD0,"
" out float4 oPosition : POSITION,"
" out float4 oColor : COLOR,"
" out float2 otexCoord : TEXCOORD"
")"
"{"
" oPosition = mul(modelViewProj, position);"
" oColor = color;"
" otexCoord = texCoord;"
"}"
""
"struct output"
"{"
" float4 color: COLOR; "
"};"
""
"struct input"
"{"
" float2 video_size;"
" float2 texture_size;"
" float2 output_size;"
" float frame_count;"
" float frame_direction;"
" float frame_rotation;"
"};"
""
"output main_fragment(float2 texCoord : TEXCOORD0,"
"uniform sampler2D decal : TEXUNIT0, uniform input IN)"
"{"
" output OUT;"
" OUT.color = tex2D(decal, texCoord);"
" return OUT;"
"}";
"void main_vertex\n"
"(\n"
" float4 position : POSITION,\n"
" float4 color : COLOR,\n"
"\n"
" uniform float4x4 modelViewProj,\n"
"\n"
" float4 texCoord : TEXCOORD0,\n"
" out float4 oPosition : POSITION,\n"
" out float4 oColor : COLOR,\n"
" out float2 otexCoord : TEXCOORD\n"
")\n"
"{\n"
" oPosition = mul(modelViewProj, position);\n"
" oColor = color;\n"
" otexCoord = texCoord;\n"
"}\n"
"\n"
"struct output\n"
"{\n"
" float4 color: COLOR;\n"
"};\n"
"\n"
"struct input\n"
"{\n"
" float2 video_size;\n"
" float2 texture_size;\n"
" float2 output_size;\n"
" float frame_count;\n"
" float frame_direction;\n"
" float frame_rotation;\n"
"};\n"
"\n"
"output main_fragment(float2 texCoord : TEXCOORD0,\n"
"uniform sampler2D decal : TEXUNIT0, uniform input IN)\n"
"{\n"
" output OUT;\n"
" OUT.color = tex2D(decal, texCoord);\n"
" return OUT;\n"
"}\n";
struct hlsl_program
{

12
msvc/RetroArch-360/RetroArch-360.vcxproj
View File

@ -124,7 +124,7 @@
</Link>
<Deploy>
<DeploymentType>CopyToHardDrive</DeploymentType>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<ForceCopy>true</ForceCopy>
</Deploy>
<ImageXex>
@ -161,7 +161,7 @@
<StackCommitSize>524288</StackCommitSize>
</Link>
<Deploy>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<ForceCopy>true</ForceCopy>
<DeploymentType>CopyToHardDrive</DeploymentType>
</Deploy>
@ -204,7 +204,7 @@
<StackCommitSize>524288</StackCommitSize>
</Link>
<Deploy>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<ForceCopy>true</ForceCopy>
<DeploymentType>CopyToHardDrive</DeploymentType>
</Deploy>
@ -246,7 +246,7 @@
<StackCommitSize>524288</StackCommitSize>
</Link>
<Deploy>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<ForceCopy>true</ForceCopy>
<DeploymentType>CopyToHardDrive</DeploymentType>
</Deploy>
@ -288,7 +288,7 @@
</Link>
<Deploy>
<DeploymentType>CopyToHardDrive</DeploymentType>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<ForceCopy>true</ForceCopy>
</Deploy>
<ImageXex>
@ -331,7 +331,7 @@
<ForceCopy>true</ForceCopy>
</Deploy>
<Deploy>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\media\shaders=$(OutDir)media\shaders</DeploymentFiles>
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media</DeploymentFiles>
<DeploymentType>CopyToHardDrive</DeploymentType>
</Deploy>
<ImageXex>

3
msvc/RetroArch-360/RetroArch-360.vcxproj.filters
View File

@ -30,9 +30,6 @@
<Filter Include="Source Files\media\hd">
<UniqueIdentifier>{76fa04d8-4379-4b8c-ae79-2aa78d380e06}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\media\shaders">
<UniqueIdentifier>{3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\griffin\griffin.c">