mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 19:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if Cg is init with NULL.

Browse Source
This commit is contained in:
Themaister 2013-04-06 20:50:22 +02:00
parent 7111558359
commit 7a20cfa79c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/gl.c
View File

@ -291,7 +291,7 @@ static bool gl_shader_init(void *data)
#ifdef HAVE_CG #ifdef HAVE_CG
case RARCH_SHADER_CG: case RARCH_SHADER_CG:
backend = &gl_cg_backend; backend = &gl_cg_backend;
if (*g_settings.video.cg_shader_path) if (*g_settings.video.cg_shader_path)
shader_path = g_settings.video.cg_shader_path; shader_path = g_settings.video.cg_shader_path;
break; break;
@ -299,8 +299,9 @@ static bool gl_shader_init(void *data)
#ifdef HAVE_GLSL #ifdef HAVE_GLSL
case RARCH_SHADER_GLSL: case RARCH_SHADER_GLSL:
backend = &gl_glsl_backend; backend = &gl_glsl_backend;
shader_path = g_settings.video.xml_shader_path; if (*g_settings.video.xml_shader_path)
shader_path = g_settings.video.xml_shader_path;
break; break;
#endif #endif

2
gfx/shader_cg.c
View File

@ -835,7 +835,7 @@ bool gl_cg_init(const char *path)
cgGLEnableProfile(cgFProf); cgGLEnableProfile(cgFProf);
cgGLEnableProfile(cgVProf); cgGLEnableProfile(cgVProf);
if (strstr(path, ".cgp")) if (path && strstr(path, ".cgp"))
{ {
if (!load_preset(path)) if (!load_preset(path))
return false; return false;