CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-03 08:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(360) Cleanup shader_hlsl.c

Browse Source
This commit is contained in:
twinaphex 2013-04-12 15:14:14 +02:00
parent 0ef62f24c4
commit 5a9194a95c
2 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/platform/platform_xdk.h
View File

@ -14,11 +14,9 @@
#include <pshpack4.h>
// Do extern "C" for C++
#if defined(__cplusplus) && !defined(XBOXINTERNAL_NO_EXTERN_C)
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#endif
// Don't do __declspec(dllimport) for things like emulators
#if defined(NTSYSAPI) && defined(DONT_IMPORT_INTERNAL)
@ -930,10 +928,9 @@ XeLoadSection(
#define STATUS_TOO_MANY_SECRETS 0xC0000156
#define STATUS_REGION_MISMATCH 0xC0050001
// End extern "C" for C++
#if defined(__cplusplus) && !defined(XBOXINTERNAL_NO_EXTERN_C)
#ifdef __cplusplus
};
#endif // __cplusplus
#endif
#include <poppack.h>

91
gfx/shader_hlsl.c
View File

@ -19,6 +19,48 @@
#include <xtl.h>
#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;"
"}";
struct hlsl_program
{
IDirect3DVertexShader9 *vprg;
@ -45,45 +87,6 @@ static bool hlsl_active = false;
static unsigned active_index = 0;
static unsigned hlsl_shader_num = 0;
static const char *stock_hlsl_program =
"void main_vertex "
"( "
" float4 position : POSITION, "
" float4 color : COLOR, "
" float4 texCoord : TEXCOORD0, "
" uniform float4x4 modelViewProj, "
" 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 hlsl_set_proj_matrix(XMMATRIX rotation_value)
{
@ -155,9 +158,9 @@ static bool load_program(unsigned index, const char *prog, bool path_is_file)
else
{
/* TODO - crashes currently - to do with 'end of line' of stock shader */
ret_fp = D3DXCompileShader(prog, (UINT)strlen(prog), NULL, NULL,
ret_fp = D3DXCompileShader(prog, strlen(prog), NULL, NULL,
"main_fragment", "ps_3_0", 0, &code_f, &listing_f, &prg[index].f_ctable );
ret_vp = D3DXCompileShader(prog, (UINT)strlen(prog), NULL, NULL,
ret_vp = D3DXCompileShader(prog, strlen(prog), NULL, NULL,
"main_vertex", "vs_3_0", 0, &code_v, &listing_v, &prg[index].v_ctable );
}
@ -227,14 +230,12 @@ bool hlsl_load_shader(unsigned index, const char *path)
if (path)
{
if (load_program(index, path, true))
{
set_program_attributes(index);
}
else
{
// Always make sure we have a valid shader.
prg[index] = prg[0];
retval = false;
retval = false;
}
}
else
@ -280,7 +281,7 @@ static void hlsl_deinit_progs(void)
prg[i].vprg->Release();
prg[i].fprg = NULL;
prg[i].vprg = NULL;
prg[i].vprg = NULL;
}
if (prg[0].fprg)