ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
twinaphex 2016-01-09 03:13:58 +01:00
parent bbe4b0e286
commit 710d2b9b27
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/d3d/render_chain_cg.cpp
View File

@ -195,7 +195,7 @@ static INLINE CGparameter find_param_from_semantic(
} }
static bool d3d9_cg_load_program(void *data, static bool d3d9_cg_load_program(void *data,
void *fragment_data, void *vertex_data, const char *shader, bool path_is_file) void *fragment_data, void *vertex_data, const char *prog, bool path_is_file)
{ {
char *listing_f = NULL; char *listing_f = NULL;
char *listing_v = NULL; char *listing_v = NULL;
@ -210,13 +210,13 @@ static bool d3d9_cg_load_program(void *data,
RARCH_LOG("[D3D Cg]: Vertex profile: %s\n", cgGetProfileString(vertex_profile)); RARCH_LOG("[D3D Cg]: Vertex profile: %s\n", cgGetProfileString(vertex_profile));
RARCH_LOG("[D3D Cg]: Fragment profile: %s\n", cgGetProfileString(fragment_profile)); RARCH_LOG("[D3D Cg]: Fragment profile: %s\n", cgGetProfileString(fragment_profile));
if (path_is_file && !string_is_empty(shader)) if (path_is_file && !string_is_empty(prog))
{ {
*fPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE, *fPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE,
shader, fragment_profile, "main_fragment", fragment_opts); prog, fragment_profile, "main_fragment", fragment_opts);
CG_D3D_SET_LISTING(cg_data, f); CG_D3D_SET_LISTING(cg_data, f);
*vPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE, *vPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE,
shader, vertex_profile, "main_vertex", vertex_opts); prog, vertex_profile, "main_vertex", vertex_opts);
CG_D3D_SET_LISTING(cg_data, v); CG_D3D_SET_LISTING(cg_data, v);
} }
else else