mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add path_is_file argument to function

Browse Source
This commit is contained in:
twinaphex 2016-01-09 02:17:43 +01:00
parent d80db66795
commit 0f0e21441d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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 std::string &shader) void *fragment_data, void *vertex_data, const std::string &shader, bool path_is_file)
{ {
char *listing_f = NULL; char *listing_f = NULL;
char *listing_v = NULL; char *listing_v = NULL;
@ -210,7 +210,7 @@ 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 (shader.length() > 0) if (path_is_file && shader.length() > 0)
{ {
*fPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE, *fPrg = cgCreateProgramFromFile(cg_data->cgCtx, CG_SOURCE,
shader.c_str(), fragment_profile, "main_fragment", fragment_opts); shader.c_str(), fragment_profile, "main_fragment", fragment_opts);
@ -862,7 +862,7 @@ static bool renderchain_create_first_pass(cg_renderchain_t *chain,
} }
d3d9_cg_load_program(chain, &pass.fPrg, d3d9_cg_load_program(chain, &pass.fPrg,
&pass.vPrg, info->pass->source.path); &pass.vPrg, info->pass->source.path, true);
if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass)) if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass))
return false; return false;
@ -895,7 +895,7 @@ static bool cg_d3d9_renderchain_init(void *data,
if (!renderchain_create_first_pass(chain, info, fmt)) if (!renderchain_create_first_pass(chain, info, fmt))
return false; return false;
renderchain_log_info(chain, info); renderchain_log_info(chain, info);
if (!d3d9_cg_load_program(chain, &chain->fStock, &chain->vStock, "")) if (!d3d9_cg_load_program(chain, &chain->fStock, &chain->vStock, "", false))
return false; return false;
return true; return true;
@ -1045,7 +1045,7 @@ static bool cg_d3d9_renderchain_add_pass(void *data, const void *info_data)
pass.last_height = 0; pass.last_height = 0;
d3d9_cg_load_program(chain, &pass.fPrg, d3d9_cg_load_program(chain, &pass.fPrg,
&pass.vPrg, info->pass->source.path); &pass.vPrg, info->pass->source.path, true);
if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass)) if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass))
return false; return false;