mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update shader_hlsl.c

Browse Source
This commit is contained in:
twinaphex 2018-01-07 21:34:39 +01:00
parent 23ace06ca1
commit 5eb5ecac77
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/drivers_shader/shader_hlsl.c
View File

@ -233,7 +233,6 @@ static bool hlsl_compile_program(
void *program_data,
struct shader_program_info *program_info)
{
HRESULT ret;
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
d3d_video_t *d3d = (d3d_video_t*)hlsl->d3d;
struct shader_program_hlsl_data *program = (struct shader_program_hlsl_data*)program_data;
@ -262,25 +261,20 @@ static bool hlsl_compile_program(
strlen(program_info->combined), NULL, NULL,
"main_fragment", "ps_3_0", 0, &code_f, &listing_f,
&program->f_ctable ))
{
RARCH_ERR("Errors here.\n");
goto error;
}
if (!d3dx_compile_shader(program_info->combined,
strlen(program_info->combined), NULL, NULL,
"main_vertex", "vs_3_0", 0, &code_v, &listing_v,
&program->v_ctable ))
{
RARCH_ERR("Errors 2 here.\n");
goto error;
}
}
d3d_create_pixel_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_f), &program->fprg);
d3d_create_vertex_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_v), &program->vprg);
d3d_create_pixel_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_f), (void**)&program->fprg);
d3d_create_vertex_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_v), (void**)&program->vprg);
d3dxbuffer_release((void*)code_f);
d3dxbuffer_release((void*)code_v);
goto end;
return true;
error:
RARCH_ERR("Cg/HLSL error:\n");
@ -288,13 +282,10 @@ error:
RARCH_ERR("Fragment:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_f));
if(listing_v)
RARCH_ERR("Vertex:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_v));
ret = false;
end:
d3dxbuffer_release((void*)listing_f);
d3dxbuffer_release((void*)listing_v);
return ret;
return false;
}
static bool hlsl_load_stock(hlsl_shader_data_t *hlsl, void *data)