libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(XMB/Shader pipeline) Rename some variables and enable ribbon by default

Browse Source
This commit is contained in:
twinaphex 2016-05-01 04:40:20 +02:00
parent 1a9206ea51
commit 6d720ff337
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.def.h
View File

@ -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;

6
configuration.c
View File

@ -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",

2
configuration.h
View File

@ -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;

2
menu/cbs/menu_cbs_get_value.c
View File

@ -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");

4
menu/drivers/xmb.c
View File

@ -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);

4
menu/menu_setting.c
View File

@ -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,