mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) HLSL shader code expanded

Browse Source
This commit is contained in:
TwinAphex51224 2012-05-06 21:57:01 +02:00
parent 959a0ea809
commit 3af750de3a
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
360/xdk360_video.cpp
View File

@ -541,7 +541,7 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
vid->d3d_render_device->SetTexture(0, vid->lpTexture); vid->d3d_render_device->SetTexture(0, vid->lpTexture);
hlsl_use(0); hlsl_use(1);
if(vid->fbo_enabled) if(vid->fbo_enabled)
{ {
hlsl_set_params(width, height, 512, 512, g_settings.video.fbo_scale_x * width, hlsl_set_params(width, height, 512, 512, g_settings.video.fbo_scale_x * width,
@ -590,7 +590,7 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
pRenderTarget0->Release(); pRenderTarget0->Release();
vid->d3d_render_device->SetTexture(0, &vid->lpTexture_ot_as16srgb); vid->d3d_render_device->SetTexture(0, &vid->lpTexture_ot_as16srgb);
hlsl_use(0); hlsl_use(2);
hlsl_set_params(g_settings.video.fbo_scale_x * width, g_settings.video.fbo_scale_y * height, g_settings.video.fbo_scale_x * 512, g_settings.video.fbo_scale_y * 512, vid->d3dpp.BackBufferWidth, hlsl_set_params(g_settings.video.fbo_scale_x * width, g_settings.video.fbo_scale_y * height, g_settings.video.fbo_scale_x * 512, g_settings.video.fbo_scale_y * 512, vid->d3dpp.BackBufferWidth,
vid->d3dpp.BackBufferHeight, g_frame_count); vid->d3dpp.BackBufferHeight, g_frame_count);
set_viewport(false); set_viewport(false);

58
gfx/shader_hlsl.c
View File

@ -43,18 +43,22 @@ static IDirect3DDevice9 *d3d_device_ptr;
static struct hlsl_program prg[RARCH_HLSL_MAX_SHADERS] = {0}; static struct hlsl_program prg[RARCH_HLSL_MAX_SHADERS] = {0};
static bool hlsl_active = false; static bool hlsl_active = false;
static unsigned active_index = 0; static unsigned active_index = 0;
static unsigned hlsl_shader_num = 0;
static const char *stock_hlsl_program = static const char *stock_hlsl_program =
"void main_vertex " "void main_vertex "
"( " "( "
" float2 position : POSITION, " " float4 position : POSITION, "
" float2 texCoord : TEXCOORD0, " " float4 color : COLOR, "
" uniform float4x4 modelViewProj : register(c0), " " float4 texCoord : TEXCOORD0, "
" uniform float4x4 modelViewProj, "
" out float4 oPosition : POSITION, " " out float4 oPosition : POSITION, "
" out float4 oColor : COLOR, "
" out float2 otexCoord : TEXCOORD " " out float2 otexCoord : TEXCOORD "
") " ") "
"{ " "{ "
" oPosition = mul(modelViewProj, float4(position, 0.0, 1.0)); " " oPosition = mul(modelViewProj, position); "
" oColor = color; "
" otexCoord = texCoord; " " otexCoord = texCoord; "
"} " "} "
" " " "
@ -68,13 +72,16 @@ static const char *stock_hlsl_program =
" float2 video_size; " " float2 video_size; "
" float2 texture_size; " " float2 texture_size; "
" float2 output_size; " " float2 output_size; "
" float frame_count; "
" float frame_direction; "
" float frame_rotation; "
"}; " "}; "
" " " "
"output main_fragment(float2 texCoord : TEXCOORD0, " "output main_fragment(float2 texCoord : TEXCOORD0, "
"uniform sampler2D decal : register(s0), uniform input IN) " "uniform sampler2D decal : TEXUNIT0, uniform input IN) "
"{ " "{ "
" output OUT; " " output OUT; "
" OUT.color = tex2D(decal, tex); " " OUT.color = tex2D(decal, texCoord); "
" return OUT; " " return OUT; "
"} "; "} ";
@ -118,7 +125,8 @@ void hlsl_set_params(unsigned width, unsigned height,
set_param_1f(prg[active_index].frame_dir_v, g_extern.frame_is_reverse ? -1.0 : 1.0,prg[active_index].v_ctable); set_param_1f(prg[active_index].frame_dir_v, g_extern.frame_is_reverse ? -1.0 : 1.0,prg[active_index].v_ctable);
/* TODO: Move to D3DXMATRIX here */ /* TODO: Move to D3DXMATRIX here */
prg[active_index].v_ctable->SetMatrix(d3d_device_ptr, prg[active_index].mvp, (D3DXMATRIX*)&prg[active_index].mvp_val); if(prg[active_index].mvp)
prg[active_index].v_ctable->SetMatrix(d3d_device_ptr, prg[active_index].mvp, (D3DXMATRIX*)&prg[active_index].mvp_val);
} }
static bool load_program(unsigned index, const char *prog, bool path_is_file) static bool load_program(unsigned index, const char *prog, bool path_is_file)
@ -197,16 +205,27 @@ static bool load_stock(void)
static bool load_plain(const char *path) static bool load_plain(const char *path)
{ {
#if 0
if (!load_stock()) if (!load_stock())
return false; return false;
#endif
RARCH_LOG("Loading HLSL file: %s\n", path); RARCH_LOG("Loading HLSL file: %s\n", path);
if (!load_program(0, path, true)) if (!load_program(1, path, true))
return false; return false;
if (*g_settings.video.second_pass_shader && g_settings.video.render_to_texture)
{
if (!load_program(2, g_settings.video.second_pass_shader, true))
return false;
hlsl_shader_num = 2;
}
else
{
prg[2] = prg[0];
hlsl_shader_num = 1;
}
return true; return true;
} }
@ -267,22 +286,25 @@ bool hlsl_init(const char *path, IDirect3DDevice9 * device_ptr)
if (!load_plain(path)) if (!load_plain(path))
return false; return false;
} }
for(unsigned i = 1; i <= hlsl_shader_num; i++)
set_program_attributes(i);
set_program_attributes(0); active_index = 1;
d3d_device_ptr->SetVertexShader(prg[active_index].vprg);
d3d_device_ptr->SetPixelShader(prg[active_index].fprg);
active_index = 0;
hlsl_active = true; hlsl_active = true;
return true; return true;
} }
void hlsl_use(unsigned index) void hlsl_use(unsigned index)
{ {
if (!hlsl_active) if (hlsl_active)
return; {
active_index = index;
active_index = index; d3d_device_ptr->SetVertexShader(prg[index].vprg);
d3d_device_ptr->SetVertexShader(prg[index].vprg); d3d_device_ptr->SetPixelShader(prg[index].fprg);
d3d_device_ptr->SetPixelShader(prg[index].fprg); }
} }
// Full deinit. // Full deinit.