menu_shader.c - cleanups

This commit is contained in:
twinaphex 2015-01-11 18:30:56 +01:00
parent 5c798e6994
commit 3419a1846c

View File

@ -123,13 +123,15 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
unsigned type, const char *preset_path) unsigned type, const char *preset_path)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
RARCH_LOG("Setting Menu shader: %s.\n", preset_path ? preset_path : "N/A (stock)"); config_file_t *conf = NULL;
g_settings.video.shader_enable = false; g_settings.video.shader_enable = false;
if (driver.video->set_shader && driver.video->set_shader(driver.video_data, if (!driver.video->set_shader)
return;
if (!driver.video->set_shader(driver.video_data,
(enum rarch_shader_type)type, preset_path)) (enum rarch_shader_type)type, preset_path))
{ return;
config_file_t *conf = NULL;
/* Makes sure that we use Menu Preset shader on driver reinit. /* Makes sure that we use Menu Preset shader on driver reinit.
* Only do this when the cgp actually works to avoid potential errors. */ * Only do this when the cgp actually works to avoid potential errors. */
@ -150,6 +152,8 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
if (conf) if (conf)
{ {
RARCH_LOG("Setting Menu shader: %s.\n", preset_path ? preset_path : "N/A (stock)");
if (gfx_shader_read_conf_cgp(conf, shader)) if (gfx_shader_read_conf_cgp(conf, shader))
{ {
gfx_shader_resolve_relative(shader, preset_path); gfx_shader_resolve_relative(shader, preset_path);
@ -159,7 +163,6 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
} }
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
}
#endif #endif
} }