From 6373819a167226f9c5bb38a4077fddb0ecff2798 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 14 Apr 2013 22:48:35 +0200 Subject: [PATCH] Use default shader type correctly. Don't hardcode Cg as it's not supported everywhere. --- frontend/menu/rgui.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 125c83eb0c..324eb81bc4 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -1233,7 +1233,18 @@ static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting, shader_manager_set_preset(type, cgp_path); } else - shader_manager_set_preset(RARCH_SHADER_CG, NULL); + { + type = gfx_shader_parse_type("", DEFAULT_SHADER_TYPE); + if (type == RARCH_SHADER_NONE) + { +#if defined(HAVE_GLSL) + type = RARCH_SHADER_GLSL; +#elif defined(HAVE_CG) || defined(HAVE_HLSL) + type = RARCH_SHADER_CG; +#endif + } + shader_manager_set_preset(type, NULL); + } } else if (setting == RGUI_SETTINGS_SHADER_PASSES) {