mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a warning when both Cg and XML shaders are selected.

Browse Source
This commit is contained in:
Themaister 2011-01-05 19:29:29 +01:00
parent e5382f8631
commit 988d1b3334
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.h
View File

@ -98,4 +98,8 @@ extern struct global g_extern;
fprintf(stderr, "SSNES [ERROR] :: " msg, ##args); \ fprintf(stderr, "SSNES [ERROR] :: " msg, ##args); \
} while(0) } while(0)
#define SSNES_WARN(msg, args...) do { \
fprintf(stderr, "SSNES [WARN] :: " msg, ##args); \
} while(0)
#endif #endif

3
gfx/gl.c
View File

@ -172,6 +172,9 @@ static const input_driver_t input_glfw = {
static inline bool gl_shader_init(void) static inline bool gl_shader_init(void)
{ {
if (strlen(g_settings.video.cg_shader_path) > 0 && strlen(g_settings.video.bsnes_shader_path) > 0)
SSNES_WARN("Both Cg and bSNES XML shader are defined in config file. Cg shader will be selected by default.\n");
#ifdef HAVE_CG #ifdef HAVE_CG
if (strlen(g_settings.video.cg_shader_path) > 0) if (strlen(g_settings.video.cg_shader_path) > 0)
return gl_cg_init(g_settings.video.cg_shader_path); return gl_cg_init(g_settings.video.cg_shader_path);