mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(HLSL) Refactor hlsl_compile_program

Browse Source
This commit is contained in:
twinaphex 2016-04-14 03:38:45 +02:00
parent e61e617e80
commit b9bb75c193
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gfx/drivers_shader/shader_hlsl.c
View File

@ -155,8 +155,8 @@ static bool hlsl_compile_program(
void *data, void *data,
void *device_data, void *device_data,
unsigned idx, unsigned idx,
const char *prog, shader_program_data_t *program,
bool path_is_file) struct shader_program_info *program_info)
{ {
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data; hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
d3d_video_t *d3d = (d3d_video_t*)device_data; d3d_video_t *d3d = (d3d_video_t*)device_data;
@ -167,20 +167,20 @@ static bool hlsl_compile_program(
ID3DXBuffer *code_f = NULL; ID3DXBuffer *code_f = NULL;
ID3DXBuffer *code_v = NULL; ID3DXBuffer *code_v = NULL;
if (path_is_file) if (program_info->is_file)
{ {
ret_fp = D3DXCompileShaderFromFile(prog, NULL, NULL, ret_fp = D3DXCompileShaderFromFile(program_info->combined, NULL, NULL,
"main_fragment", "ps_3_0", 0, &code_f, &listing_f, &hlsl->prg[idx].f_ctable); "main_fragment", "ps_3_0", 0, &code_f, &listing_f, &program->f_ctable);
ret_vp = D3DXCompileShaderFromFile(prog, NULL, NULL, ret_vp = D3DXCompileShaderFromFile(program_info->combined, NULL, NULL,
"main_vertex", "vs_3_0", 0, &code_v, &listing_v, &hlsl->prg[idx].v_ctable); "main_vertex", "vs_3_0", 0, &code_v, &listing_v, &program->v_ctable);
} }
else else
{ {
/* TODO - crashes currently - to do with 'end of line' of stock shader */ /* TODO - crashes currently - to do with 'end of line' of stock shader */
ret_fp = D3DXCompileShader(prog, strlen(prog), NULL, NULL, ret_fp = D3DXCompileShader(program_info->combined, strlen(program_info->combined), NULL, NULL,
"main_fragment", "ps_3_0", 0, &code_f, &listing_f, &hlsl->prg[idx].f_ctable ); "main_fragment", "ps_3_0", 0, &code_f, &listing_f, &program->f_ctable );
ret_vp = D3DXCompileShader(prog, strlen(prog), NULL, NULL, ret_vp = D3DXCompileShader(program_info->combined, strlen(program_info->combined), NULL, NULL,
"main_vertex", "vs_3_0", 0, &code_v, &listing_v, &hlsl->prg[idx].v_ctable ); "main_vertex", "vs_3_0", 0, &code_v, &listing_v, &program->v_ctable );
} }
if (ret_fp < 0 || ret_vp < 0 || listing_v || listing_f) if (ret_fp < 0 || ret_vp < 0 || listing_v || listing_f)
@ -195,8 +195,8 @@ static bool hlsl_compile_program(
goto end; goto end;
} }
d3d_device_ptr->CreatePixelShader((const DWORD*)code_f->GetBufferPointer(), &hlsl->prg[idx].fprg); d3d_device_ptr->CreatePixelShader((const DWORD*)code_f->GetBufferPointer(), &program->fprg);
d3d_device_ptr->CreateVertexShader((const DWORD*)code_v->GetBufferPointer(), &hlsl->prg[idx].vprg); d3d_device_ptr->CreateVertexShader((const DWORD*)code_v->GetBufferPointer(), &program->vprg);
code_f->Release(); code_f->Release();
code_v->Release(); code_v->Release();
@ -210,7 +210,12 @@ end:
static bool hlsl_load_stock(hlsl_shader_data_t *hlsl, void *data) static bool hlsl_load_stock(hlsl_shader_data_t *hlsl, void *data)
{ {
if (!hlsl_compile_program(hlsl, data, 0, stock_hlsl_program, false)) struct shader_program_info program_info;
program_info.combined = stock_hlsl_program;
program_info.is_file = false;
if (!hlsl_compile_program(hlsl, data, 0, &hlsl->prg[0], &program_info))
{ {
RARCH_ERR("Failed to compile passthrough shader, is something wrong with your environment?\n"); RARCH_ERR("Failed to compile passthrough shader, is something wrong with your environment?\n");
return false; return false;
@ -241,14 +246,18 @@ static void hlsl_set_program_attributes(hlsl_shader_data_t *hlsl, unsigned i)
static bool hlsl_load_shader(hlsl_shader_data_t *hlsl, static bool hlsl_load_shader(hlsl_shader_data_t *hlsl,
void *data, const char *cgp_path, unsigned i) void *data, const char *cgp_path, unsigned i)
{ {
struct shader_program_info program_info;
char path_buf[PATH_MAX_LENGTH] = {0}; char path_buf[PATH_MAX_LENGTH] = {0};
program_info.combined = path_buf;
program_info.is_file = true;
fill_pathname_resolve_relative(path_buf, cgp_path, fill_pathname_resolve_relative(path_buf, cgp_path,
hlsl->cg_shader->pass[i].source.path, sizeof(path_buf)); hlsl->cg_shader->pass[i].source.path, sizeof(path_buf));
RARCH_LOG("Loading Cg/HLSL shader: \"%s\".\n", path_buf); RARCH_LOG("Loading Cg/HLSL shader: \"%s\".\n", path_buf);
if (!hlsl_compile_program(hlsl, data, i + 1, path_buf, true)) if (!hlsl_compile_program(hlsl, data, i + 1, &hlsl->prg[i + 1], &program_info))
return false; return false;
return true; return true;
@ -267,10 +276,16 @@ static bool hlsl_load_plain(hlsl_shader_data_t *hlsl, void *data, const char *pa
if (!string_is_empty(path)) if (!string_is_empty(path))
{ {
struct shader_program_info program_info;
program_info.combined = path;
program_info.is_file = true;
RARCH_LOG("Loading Cg/HLSL file: %s\n", path); RARCH_LOG("Loading Cg/HLSL file: %s\n", path);
strlcpy(hlsl->cg_shader->pass[0].source.path, strlcpy(hlsl->cg_shader->pass[0].source.path,
path, sizeof(hlsl->cg_shader->pass[0].source.path)); path, sizeof(hlsl->cg_shader->pass[0].source.path));
if (!hlsl_compile_program(hlsl, data, 1, path, true)) if (!hlsl_compile_program(hlsl, data, 1, &hlsl->prg[1], &progarm_info))
return false; return false;
} }
else else