From 6d720ff3374c5340b4ec43ff064dba28c4b13fdb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 May 2016 04:40:20 +0200 Subject: [PATCH] (XMB/Shader pipeline) Rename some variables and enable ribbon by default --- config.def.h | 4 ++-- configuration.c | 6 +++--- configuration.h | 2 +- menu/cbs/menu_cbs_get_value.c | 2 +- menu/drivers/xmb.c | 4 ++-- menu/menu_setting.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config.def.h b/config.def.h index 1b3953f4d6..00995cc75a 100644 --- a/config.def.h +++ b/config.def.h @@ -516,9 +516,9 @@ static unsigned xmb_gradient = 0; static bool xmb_shadows_enable = false; #if defined(HAVE_OPENGLES2) -static unsigned xmb_ribbon_enable = 1; +static unsigned menu_shader_pipeline = 1; #else -static unsigned xmb_ribbon_enable = 0; +static unsigned menu_shader_pipeline = 2; #endif static bool show_advanced_settings = true; diff --git a/configuration.c b/configuration.c index 29db74cc39..c1d9188c94 100644 --- a/configuration.c +++ b/configuration.c @@ -487,7 +487,7 @@ static void config_set_defaults(void) settings->menu.xmb_theme = xmb_theme; settings->menu.xmb_gradient = xmb_gradient; settings->menu.xmb_shadows_enable = xmb_shadows_enable; - settings->menu.xmb_ribbon_enable = xmb_ribbon_enable; + settings->menu.shader_pipeline = menu_shader_pipeline; settings->menu.xmb_font[0] = '\0'; settings->menu.throttle_framerate = true; settings->menu.linear_filter = true; @@ -1551,7 +1551,7 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_BASE(conf, settings, menu.xmb_theme, "xmb_theme"); CONFIG_GET_INT_BASE(conf, settings, menu.xmb_gradient, "xmb_gradient"); CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows_enable, "xmb_shadows_enable"); - CONFIG_GET_INT_BASE(conf, settings, menu.xmb_ribbon_enable, "xmb_ribbon_enable"); + CONFIG_GET_INT_BASE(conf, settings, menu.shader_pipeline, "menu_shader_pipeline"); config_get_path(conf, "xmb_font", settings->menu.xmb_font, sizeof(settings->menu.xmb_font)); #endif config_get_array(conf, "video_context_driver", settings->video.context_driver, sizeof(settings->video.context_driver)); @@ -2819,7 +2819,7 @@ bool config_save_file(const char *path) config_set_int(conf, "xmb_theme", settings->menu.xmb_theme); config_set_int(conf, "xmb_gradient", settings->menu.xmb_gradient); config_set_bool(conf, "xmb_shadows_enable", settings->menu.xmb_shadows_enable); - config_set_int(conf, "xmb_ribbon_enable", settings->menu.xmb_ribbon_enable); + config_set_int(conf, "menu_shader_pipeline", settings->menu.shader_pipeline); config_set_path(conf, "xmb_font", !string_is_empty(settings->menu.xmb_font) ? settings->menu.xmb_font : ""); config_set_bool(conf, "rgui_show_start_screen", diff --git a/configuration.h b/configuration.h index 012f86378a..84274e2a2f 100644 --- a/configuration.h +++ b/configuration.h @@ -163,7 +163,7 @@ typedef struct settings unsigned xmb_theme; unsigned xmb_gradient; bool xmb_shadows_enable; - unsigned xmb_ribbon_enable; + unsigned shader_pipeline; char xmb_font[PATH_MAX_LENGTH]; bool throttle_framerate; bool linear_filter; diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 1a17059a67..6d0a66442a 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -180,7 +180,7 @@ static void menu_action_setting_disp_set_label_pipeline( *s = '\0'; *w = 19; - switch (settings->menu.xmb_ribbon_enable) + switch (settings->menu.shader_pipeline) { case 0: snprintf(s, len, "%s", "OFF"); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9470482ecf..fad8c74efd 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1947,7 +1947,7 @@ static void xmb_draw_bg( menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL); - if (settings->menu.xmb_ribbon_enable > 0) + if (settings->menu.shader_pipeline > 0) { draw.color = xmb_gradient_ident(); @@ -1957,7 +1957,7 @@ static void xmb_draw_bg( menu_display_set_alpha(draw.color, coord_white[3]); draw.pipeline.id = VIDEO_SHADER_MENU_SEC; - if (settings->menu.xmb_ribbon_enable == 2) + if (settings->menu.shader_pipeline == 2) draw.pipeline.id = VIDEO_SHADER_MENU; menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, &draw); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 81511abeb0..ee7e0ab8b7 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5970,10 +5970,10 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, - &settings->menu.xmb_ribbon_enable, + &settings->menu.shader_pipeline, menu_hash_to_str(MENU_LABEL_XMB_RIBBON_ENABLE), menu_hash_to_str(MENU_LABEL_VALUE_XMB_RIBBON_ENABLE), - xmb_ribbon_enable, + menu_shader_pipeline, &group_info, &subgroup_info, parent_group,