mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) Should save soft_display_filter to config file now

Browse Source 
(CONSOLE) throttle mode will not be enabled if force_nonblock
is set to true
This commit is contained in:
Twinaphex 2012-08-15 21:00:23 +02:00
parent 405a901d18
commit bbe0f00059
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/rarch_console_config.c
View File

@ -103,8 +103,8 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
CONFIG_GET_BOOL_CONSOLE(gamma_correction, "gamma_correction");
#ifdef _XBOX1
CONFIG_GET_INT_CONSOLE(flicker_filter, "fliker_filter");
CONFIG_GET_BOOL_CONSOLE(soft_display_filter_enable, "soft_display_filter_enable");
#endif
CONFIG_GET_BOOL_CONSOLE(soft_display_filter_enable, "soft_display_filter_enable");
CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir");
CONFIG_GET_FLOAT_CONSOLE(menu_font_size, "menu_font_size");
CONFIG_GET_FLOAT_CONSOLE(overscan_amount, "overscan_amount");
@ -160,8 +160,8 @@ void rarch_config_save(const char * conf_name)
#ifdef _XBOX360
config_set_int(conf, "color_format", g_console.color_format);
#endif
#ifdef _XBOX1
config_set_bool(conf, "soft_display_filter_enable", g_console.soft_display_filter_enable);
#ifdef _XBOX1
config_set_int(conf, "flicker_filter", g_console.flicker_filter);
#endif
config_set_bool(conf, "throttle_enable", g_console.throttle_enable);

6
console/rarch_console_settings.c
View File

@ -148,7 +148,8 @@ void rarch_settings_change(unsigned setting)
g_settings.video.fbo_scale_y += 1.0f;
break;
case S_THROTTLE:
g_console.throttle_enable = !g_console.throttle_enable;
if(!g_extern.system.force_nonblock)
g_console.throttle_enable = !g_console.throttle_enable;
break;
case S_TRIPLE_BUFFERING:
g_console.triple_buffering_enable = !g_console.triple_buffering_enable;
@ -189,7 +190,8 @@ void rarch_settings_default(unsigned setting)
g_console.screen_orientation = ORIENTATION_NORMAL;
break;
case S_DEF_THROTTLE:
g_console.throttle_enable = true;
if(!g_extern.system.force_nonblock)
g_console.throttle_enable = true;
break;
case S_DEF_TRIPLE_BUFFERING:
g_console.triple_buffering_enable = true;

1
retroarch.c
View File

@ -72,6 +72,7 @@ static void set_fast_forward_button(bool new_button_state, bool new_hold_button_
if (update_sync)
{
RARCH_LOG("Video active = %u, VSync = %u, Force nonblock = %u\n", g_extern.video_active, g_settings.video.vsync, g_extern.system.force_nonblock);
// Only apply non-block-state for video if we're using vsync.
if (g_extern.video_active && g_settings.video.vsync && !g_extern.system.force_nonblock)
video_set_nonblock_state_func(syncing_state);