mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Reimplement Quick Menu - > Shaders -> Watch shader files for

Browse Source 
changes - can now be turned on/off through touch
This commit is contained in:
twinaphex 2019-12-24 17:18:29 +01:00
parent c240449b10
commit ef149605cd
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/cbs/menu_cbs_left.c
View File

@ -378,14 +378,6 @@ static int action_left_shader_num_passes(unsigned type, const char *label,
return 0; return 0;
} }
static int action_left_shader_watch_for_changes(unsigned type, const char *label,
bool wraparound)
{
settings_t *settings = config_get_ptr();
settings->bools.video_shader_watch_files = !settings->bools.video_shader_watch_files;
return 0;
}
#endif #endif
static int action_left_video_resolution(unsigned type, const char *label, static int action_left_video_resolution(unsigned type, const char *label,
@ -812,11 +804,6 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER: case MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
BIND_ACTION_LEFT(cbs, action_left_shader_filter_default); BIND_ACTION_LEFT(cbs, action_left_shader_filter_default);
#endif
break;
case MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
BIND_ACTION_LEFT(cbs, action_left_shader_watch_for_changes);
#endif #endif
break; break;
case MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES: case MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES:

15
menu/cbs/menu_cbs_right.c
View File

@ -460,16 +460,6 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
return 0; return 0;
} }
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
static int action_right_shader_watch_for_changes(unsigned type, const char *label,
bool wraparound)
{
settings_t *settings = config_get_ptr();
settings->bools.video_shader_watch_files = !settings->bools.video_shader_watch_files;
return 0;
}
#endif
static int action_right_video_resolution(unsigned type, const char *label, static int action_right_video_resolution(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
@ -954,11 +944,6 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER: case MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
BIND_ACTION_RIGHT(cbs, action_right_shader_filter_default); BIND_ACTION_RIGHT(cbs, action_right_shader_filter_default);
#endif
break;
case MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
BIND_ACTION_RIGHT(cbs, action_right_shader_watch_for_changes);
#endif #endif
break; break;
case MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES: case MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES:

16
menu/menu_setting.c
View File

@ -10149,6 +10149,22 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, 0, 0, 1, true, false); menu_settings_list_current_add_range(list, list_info, 0, 0, 1, true, false);
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
list, list_info,
&settings->bools.video_shader_watch_files,
MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES,
MENU_ENUM_LABEL_VALUE_SHADER_WATCH_FOR_CHANGES,
DEFAULT_VIDEO_SHADER_WATCH_FILES,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE
);
#if !defined(RARCH_MOBILE) #if !defined(RARCH_MOBILE)
if (video_driver_test_all_flags(GFX_CTX_FLAGS_BLACK_FRAME_INSERTION)) if (video_driver_test_all_flags(GFX_CTX_FLAGS_BLACK_FRAME_INSERTION))
{ {