libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-02-01 13:01:06 +01:00
parent a495cff6ab
commit 1f3acec93a
2 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
menu/menu_entries_cbs.c
View File

@ -4055,6 +4055,66 @@ static void menu_action_setting_disp_set_label_remap_file_load(
type_str_size);
}
static void menu_action_setting_disp_set_label_shader_filter_pass(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *type_str, size_t type_str_size,
const char *entry_label,
const char *path,
char *path_buf, size_t path_buf_size)
{
unsigned pass;
static const char *modes[] = {
"Don't care",
"Linear",
"Nearest"
};
*type_str = '\0';
*w = 19;
strlcpy(path_buf, path, path_buf_size);
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (!driver.menu->shader)
return;
pass = (type - MENU_SETTINGS_SHADER_PASS_FILTER_0);
strlcpy(type_str, modes[driver.menu->shader->pass[pass].filter],
type_str_size);
#endif
}
static void menu_action_setting_disp_set_label_shader_scale_pass(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *type_str, size_t type_str_size,
const char *entry_label,
const char *path,
char *path_buf, size_t path_buf_size)
{
unsigned pass, scale_value;
*type_str = '\0';
*w = 19;
strlcpy(path_buf, path, path_buf_size);
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (!driver.menu->shader)
return;
pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0);
scale_value = driver.menu->shader->pass[pass].fbo.scale_x;
if (!scale_value)
strlcpy(type_str, "Don't care", type_str_size);
else
snprintf(type_str, type_str_size, "%ux", scale_value);
#endif
}
static void menu_action_setting_disp_set_label_menu_file_core(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
@ -5028,6 +5088,12 @@ static void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_
else if (!strcmp(label, "remap_file_load"))
cbs->action_get_representation =
menu_action_setting_disp_set_label_remap_file_load;
else if (!strcmp(label, "video_shader_filter_pass"))
cbs->action_get_representation =
menu_action_setting_disp_set_label_shader_filter_pass;
else if (!strcmp(label, "video_shader_scale_pass"))
cbs->action_get_representation =
menu_action_setting_disp_set_label_shader_scale_pass;
else
{
switch (type)

27
settings_data.c
View File

@ -2759,12 +2759,6 @@ int setting_data_get_description(const char *label, char *msg,
}
#ifdef HAVE_MENU
#if defined(GEKKO)
extern unsigned menu_gx_resolutions[][2];
extern unsigned menu_current_gx_resolution;
#endif
static void get_string_representation_bind_device(void * data, char *type_str,
size_t type_str_size)
{
@ -2873,27 +2867,6 @@ void setting_data_get_label(void *data, char *type_str,
else
strlcpy(type_str, "N/A", type_str_size);
}
else if (!strcmp(label, "video_shader_filter_pass"))
{
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_FILTER_0);
static const char *modes[] = {
"Don't care",
"Linear",
"Nearest"
};
strlcpy(type_str, modes[driver.menu->shader->pass[pass].filter],
type_str_size);
}
else if (!strcmp(label, "video_shader_scale_pass"))
{
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0);
unsigned scale_value = driver.menu->shader->pass[pass].fbo.scale_x;
if (!scale_value)
strlcpy(type_str, "Don't care", type_str_size);
else
snprintf(type_str, type_str_size, "%ux", scale_value);
}
}
#endif
else