mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add default filtering option to RGUI.

Browse Source
This commit is contained in:
Themaister 2013-04-14 01:45:33 +02:00
parent e1c1e4d414
commit ca5ff43b6f
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/menu/rgui.c
View File

@ -446,7 +446,7 @@ static void render_text(rgui_handle_t *rgui)
unsigned port = menu_type - RGUI_SETTINGS_CONTROLLER_1; unsigned port = menu_type - RGUI_SETTINGS_CONTROLLER_1;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
if (type >= RGUI_SETTINGS_SHADER_PRESET && if (type >= RGUI_SETTINGS_SHADER_FILTER &&
type <= RGUI_SETTINGS_SHADER_LAST) type <= RGUI_SETTINGS_SHADER_LAST)
{ {
// HACK. Work around that we're using the menu_type as dir type to propagate state correctly. // HACK. Work around that we're using the menu_type as dir type to propagate state correctly.
@ -456,6 +456,9 @@ static void render_text(rgui_handle_t *rgui)
strlcpy(type_str, "(DIR)", sizeof(type_str)); strlcpy(type_str, "(DIR)", sizeof(type_str));
w = 5; w = 5;
} }
else if (type == RGUI_SETTINGS_SHADER_FILTER)
snprintf(type_str, sizeof(type_str), "%s",
g_settings.video.smooth ? "Linear" : "Nearest");
else if (type == RGUI_SETTINGS_SHADER_PRESET) else if (type == RGUI_SETTINGS_SHADER_PRESET)
strlcpy(type_str, "...", sizeof(type_str)); strlcpy(type_str, "...", sizeof(type_str));
else else
@ -675,7 +678,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
(void)rgui; (void)rgui;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
if (setting >= RGUI_SETTINGS_SHADER_PRESET && setting <= RGUI_SETTINGS_SHADER_LAST) if (setting >= RGUI_SETTINGS_SHADER_FILTER && setting <= RGUI_SETTINGS_SHADER_LAST)
return shader_manager_toggle_setting(rgui, setting, action); return shader_manager_toggle_setting(rgui, setting, action);
#endif #endif
if (setting >= RGUI_SETTINGS_CORE_OPTION_START) if (setting >= RGUI_SETTINGS_CORE_OPTION_START)
@ -1107,6 +1110,8 @@ static void rgui_settings_shader_manager_populate_entries(rgui_handle_t *rgui)
rgui_list_clear(rgui->selection_buf); rgui_list_clear(rgui->selection_buf);
rgui_list_push(rgui->selection_buf, "Apply changes", rgui_list_push(rgui->selection_buf, "Apply changes",
RGUI_SETTINGS_SHADER_APPLY, 0); RGUI_SETTINGS_SHADER_APPLY, 0);
rgui_list_push(rgui->selection_buf, "Default filter",
RGUI_SETTINGS_SHADER_FILTER, 0);
rgui_list_push(rgui->selection_buf, "Load shader preset", rgui_list_push(rgui->selection_buf, "Load shader preset",
RGUI_SETTINGS_SHADER_PRESET, 0); RGUI_SETTINGS_SHADER_PRESET, 0);
rgui_list_push(rgui->selection_buf, "Shader passes", rgui_list_push(rgui->selection_buf, "Shader passes",
@ -1183,7 +1188,25 @@ static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting,
unsigned dist_filter = setting - RGUI_SETTINGS_SHADER_0_FILTER; unsigned dist_filter = setting - RGUI_SETTINGS_SHADER_0_FILTER;
unsigned dist_scale = setting - RGUI_SETTINGS_SHADER_0_SCALE; unsigned dist_scale = setting - RGUI_SETTINGS_SHADER_0_SCALE;
if (setting == RGUI_SETTINGS_SHADER_APPLY) if (setting == RGUI_SETTINGS_SHADER_FILTER)
{
switch (action)
{
case RGUI_ACTION_START:
g_settings.video.smooth = true;
break;
case RGUI_ACTION_LEFT:
case RGUI_ACTION_RIGHT:
case RGUI_ACTION_OK:
g_settings.video.smooth = !g_settings.video.smooth;
break;
default:
break;
}
}
else if (setting == RGUI_SETTINGS_SHADER_APPLY)
{ {
if (!driver.video->set_shader || action != RGUI_ACTION_OK) if (!driver.video->set_shader || action != RGUI_ACTION_OK)
return 0; return 0;

1
frontend/menu/rgui.h
View File

@ -38,6 +38,7 @@ typedef enum
// Shader stuff // Shader stuff
RGUI_SETTINGS_SHADER_MANAGER, RGUI_SETTINGS_SHADER_MANAGER,
RGUI_SETTINGS_SHADER_FILTER,
RGUI_SETTINGS_SHADER_PRESET, RGUI_SETTINGS_SHADER_PRESET,
RGUI_SETTINGS_SHADER_APPLY, RGUI_SETTINGS_SHADER_APPLY,
RGUI_SETTINGS_SHADER_PASSES, RGUI_SETTINGS_SHADER_PASSES,

2
gfx/gl.c
View File

@ -469,7 +469,7 @@ static void gl_create_fbo_textures(void *data)
glGenTextures(gl->fbo_pass, gl->fbo_texture); glGenTextures(gl->fbo_pass, gl->fbo_texture);
GLuint base_filt = gl->tex_filter; GLuint base_filt = g_settings.video.smooth ? GL_LINEAR : GL_NEAREST;
for (int i = 0; i < gl->fbo_pass; i++) for (int i = 0; i < gl->fbo_pass; i++)
{ {
glBindTexture(GL_TEXTURE_2D, gl->fbo_texture[i]); glBindTexture(GL_TEXTURE_2D, gl->fbo_texture[i]);