From f93c00630e80c5903f71bdbd7da658a6244d5357 Mon Sep 17 00:00:00 2001 From: lasers Date: Sat, 10 Dec 2016 15:52:56 -0600 Subject: [PATCH 001/205] Add sublabel for UserInterface (pause_nonactive,composition) --- intl/msg_hash_de.h | 4 ++++ intl/msg_hash_eo.h | 4 ++++ intl/msg_hash_fr.h | 4 ++++ intl/msg_hash_ja.h | 4 ++++ intl/msg_hash_nl.h | 4 ++++ intl/msg_hash_ru.h | 4 ++++ intl/msg_hash_us.h | 4 ++++ menu/cbs/menu_cbs_sublabel.c | 8 ++++++++ 8 files changed, 36 insertions(+) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index ccc5030779..1d24e2495f 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -838,3 +838,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, "Zeige Videos") MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Ja") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index bbe0bb4ba6..c5b4df14c8 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2237,3 +2237,7 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_RATING, "Database - Filter : Edge Magazine Rating") MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DATABASE_INFO, "Database Info") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 2396ee4208..a3784bce99 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -2203,3 +2203,7 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_RATING, "Database - Filter : Edge Magazine Rating") MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DATABASE_INFO, "Database Info") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 4ead3d31ca..edaaad0f4e 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -2257,3 +2257,7 @@ MSG_HASH(MSG_NETPLAY_LAN_SCAN_COMPLETE, "ネットプレイスキャン完了。") MSG_HASH(MSG_NETPLAY_LAN_SCANNING, "ネットプレイホストをスキャン中") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index f40cca9559..5c88829f23 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2237,3 +2237,7 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_RATING, "Database - Filter : Edge Magazine Rating") MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DATABASE_INFO, "Database Info") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 129b7b4904..773d219acd 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -2231,3 +2231,7 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_RATING, "Database - Filter : Edge Magazine Rating") MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DATABASE_INFO, "Database Info") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 055c2e31c6..e7a4457ec6 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2269,3 +2269,7 @@ MSG_HASH(MSG_NETPLAY_LAN_SCAN_COMPLETE, "Netplay scan complete.") MSG_HASH(MSG_NETPLAY_LAN_SCANNING, "Scanning for netplay hosts...") +MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, + "Pause gameplay when window focus is lost.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, + "Enable or disable composition (Windows only).") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index bae847c563..495f0cddeb 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -110,6 +110,8 @@ default_sublabel_macro(action_bind_sublabel_dummy_check_missing_firmware, MENU_ default_sublabel_macro(action_bind_sublabel_video_refresh_rate, MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE) default_sublabel_macro(action_bind_sublabel_audio_enable, MENU_ENUM_SUBLABEL_AUDIO_ENABLE) default_sublabel_macro(action_bind_sublabel_audio_max_timing_skew, MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW) +default_sublabel_macro(action_bind_sublabel_pause_nonactive, MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE) +default_sublabel_macro(action_bind_sublabel_video_disable_composition, MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -395,6 +397,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_VIDEO_SCALE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_scale); break; + case MENU_ENUM_LABEL_PAUSE_NONACTIVE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_pause_nonactive); + break; + case MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_disable_composition); + break; default: case MSG_UNKNOWN: return -1; From 476ce38e3b798aff4be8b15ba55ccb4acf11801b Mon Sep 17 00:00:00 2001 From: lasers Date: Sat, 10 Dec 2016 16:38:33 -0600 Subject: [PATCH 002/205] Add sublabel for Playlists (enable,history_size) --- intl/msg_hash_de.h | 4 ++++ intl/msg_hash_eo.h | 4 ++++ intl/msg_hash_fr.h | 4 ++++ intl/msg_hash_ja.h | 4 ++++ intl/msg_hash_nl.h | 4 ++++ intl/msg_hash_ru.h | 4 ++++ intl/msg_hash_us.h | 4 ++++ menu/cbs/menu_cbs_sublabel.c | 8 ++++++++ 8 files changed, 36 insertions(+) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 1d24e2495f..6117c5a6d5 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -842,3 +842,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index c5b4df14c8..311dffe647 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2241,3 +2241,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index a3784bce99..ffe5013be0 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -2207,3 +2207,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index edaaad0f4e..4ce00a91e4 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -2261,3 +2261,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 5c88829f23..3f6c3d41db 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2241,3 +2241,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 773d219acd..2ef320b97e 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -2235,3 +2235,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index e7a4457ec6..b50457c8c5 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2273,3 +2273,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE, "Pause gameplay when window focus is lost.") MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION, "Enable or disable composition (Windows only).") +MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, + "Enable or disable recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, + "Limit the number of entries in recent playlist for games, images, music, and videos.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 495f0cddeb..a9310f195e 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -112,6 +112,8 @@ default_sublabel_macro(action_bind_sublabel_audio_enable, MENU_ default_sublabel_macro(action_bind_sublabel_audio_max_timing_skew, MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW) default_sublabel_macro(action_bind_sublabel_pause_nonactive, MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE) default_sublabel_macro(action_bind_sublabel_video_disable_composition, MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION) +default_sublabel_macro(action_bind_sublabel_history_list_enable, MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE) +default_sublabel_macro(action_bind_sublabel_content_history_size, MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -403,6 +405,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_disable_composition); break; + case MENU_ENUM_LABEL_HISTORY_LIST_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_history_list_enable); + break; + case MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_history_size); + break; default: case MSG_UNKNOWN: return -1; From 9957099bf0f9568538cf35e3ba6f882b1d552c17 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 01:29:53 +0100 Subject: [PATCH 003/205] Add 'unified menu controls' setting --- configuration.c | 1 + configuration.h | 2 ++ intl/msg_hash_de.h | 2 ++ intl/msg_hash_eo.h | 2 ++ intl/msg_hash_fr.h | 2 ++ intl/msg_hash_ja.h | 2 ++ intl/msg_hash_lbl.h | 2 ++ intl/msg_hash_nl.h | 2 ++ intl/msg_hash_ru.h | 2 ++ intl/msg_hash_us.h | 4 ++++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ menu/menu_displaylist.c | 3 +++ menu/menu_setting.c | 16 ++++++++++++++++ msg_hash.h | 1 + retroarch.cfg | 3 +++ runloop.c | 14 ++++++++++---- 16 files changed, 58 insertions(+), 4 deletions(-) diff --git a/configuration.c b/configuration.c index 3c0bb87be5..50530a9b96 100644 --- a/configuration.c +++ b/configuration.c @@ -773,6 +773,7 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti SETTING_BOOL("video_vfilter", &settings->video.vfilter, true, video_vfilter, false); #endif #ifdef HAVE_MENU + SETTING_BOOL("menu_unified_controls", &settings->menu.unified_controls, true, false, false); #ifdef HAVE_THREADS SETTING_BOOL("threaded_data_runloop_enable", &settings->threaded_data_runloop_enable, true, threaded_data_runloop_enable, false); #endif diff --git a/configuration.h b/configuration.h index 3612a07615..d4cc94cf91 100644 --- a/configuration.h +++ b/configuration.h @@ -204,6 +204,8 @@ typedef struct settings { unsigned menu_color_theme; } materialui; + + bool unified_controls; } menu; #endif diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 6117c5a6d5..9a340fe5d9 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -846,3 +846,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 311dffe647..cbb044b7c0 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2245,3 +2245,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index ffe5013be0..7a63ea1932 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -2211,3 +2211,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 4ce00a91e4..e63f10a684 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -2265,3 +2265,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 8e9547099c..77618556b5 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1151,3 +1151,5 @@ MSG_HASH(MENU_ENUM_LABEL_SHADER_PIPELINE_SIMPLE_SNOW, "shader_pipeline_simple_snow") MSG_HASH(MENU_ENUM_LABEL_SHADER_PIPELINE_SNOW, "shader_pipeline_snow") +MSG_HASH(MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, + "unified_menu_controls") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 3f6c3d41db..4e307c7585 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2245,3 +2245,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 2ef320b97e..f1b0b369f0 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -2239,3 +2239,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index b50457c8c5..b700be4636 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2277,3 +2277,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE, "Enable or disable recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index a9310f195e..51f179f964 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -114,6 +114,7 @@ default_sublabel_macro(action_bind_sublabel_pause_nonactive, MENU_ default_sublabel_macro(action_bind_sublabel_video_disable_composition, MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION) default_sublabel_macro(action_bind_sublabel_history_list_enable, MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE) default_sublabel_macro(action_bind_sublabel_content_history_size, MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE) +default_sublabel_macro(action_bind_sublabel_menu_input_unified_controls, MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -155,6 +156,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_input_unified_controls); + break; case MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_max_timing_skew); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b987e4b5b4..1fc78c7600 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5376,6 +5376,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, PARSE_ONLY_BOOL, false); #endif + ret = menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, + PARSE_ONLY_BOOL, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR, PARSE_ONLY_UINT, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 89951b1cf5..1fc9357c0f 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3912,6 +3912,22 @@ static bool setting_append_list( general_read_handler); menu_settings_list_current_add_range(list, list_info, 1, MAX_USERS, 1, true, true); + CONFIG_BOOL( + list, list_info, + &settings->menu.unified_controls, + MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, + MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, + false, + 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 + ); + CONFIG_UINT( list, list_info, &settings->input.poll_type_behavior, diff --git a/msg_hash.h b/msg_hash.h index 14146274b8..777a62f85d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -568,6 +568,7 @@ enum msg_hash_enums MENU_LABEL(INPUT_ICADE_ENABLE), MENU_LABEL(INPUT_ALL_USERS_CONTROL_MENU), MENU_LABEL(INPUT_POLL_TYPE_BEHAVIOR), + MENU_LABEL(INPUT_UNIFIED_MENU_CONTROLS), /* Video */ MENU_LABEL(VIDEO_FONT_ENABLE), diff --git a/retroarch.cfg b/retroarch.cfg index 2de7ae0e85..4f660bd41f 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -640,6 +640,9 @@ # are in the menu. # menu_pause_libretro = false +# If disabled, we use separate controls for menu operation. +# menu_unified_controls = false + # Enable mouse input inside the menu. # menu_mouse_enable = false diff --git a/runloop.c b/runloop.c index 82bf765c90..dd9326258b 100644 --- a/runloop.c +++ b/runloop.c @@ -1076,6 +1076,8 @@ static enum runloop_state runloop_check_state( return RUNLOOP_STATE_ITERATE; } +#define runloop_menu_unified_controls_pressed() (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) && settings->menu.unified_controls) + /** * runloop_iterate: * @@ -1090,15 +1092,19 @@ int runloop_iterate(unsigned *sleep_ms) unsigned i; retro_time_t current, target, to_sleep_ms; uint64_t trigger_input = 0; + uint64_t current_input = 0; static uint64_t last_input = 0; settings_t *settings = config_get_ptr(); uint64_t old_input = last_input; - uint64_t current_input = + #ifdef HAVE_MENU - menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) ? - input_menu_keys_pressed(old_input, &last_input, &trigger_input, runloop_paused) : + if (!runloop_menu_unified_controls_pressed()) + current_input = input_menu_keys_pressed(old_input, + &last_input, &trigger_input, runloop_paused); + else #endif - input_keys_pressed (old_input, &last_input, &trigger_input, runloop_paused); + current_input = input_keys_pressed(old_input, &last_input, + &trigger_input, runloop_paused); if (runloop_frame_time.callback) { From 78cf06adcfa2be015a44d034e085bec45800fa31 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 01:40:25 +0100 Subject: [PATCH 004/205] (intl) Updates --- intl/msg_hash_de.h | 2 ++ intl/msg_hash_eo.h | 2 ++ intl/msg_hash_fr.h | 2 ++ intl/msg_hash_ja.h | 2 ++ intl/msg_hash_nl.h | 2 ++ intl/msg_hash_ru.h | 2 ++ 6 files changed, 12 insertions(+) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 9a340fe5d9..a98a484606 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -848,3 +848,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index cbb044b7c0..d3044d7f78 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2247,3 +2247,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 7a63ea1932..7807aecb34 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -2213,3 +2213,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index e63f10a684..d1b6bc8aa9 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -2267,3 +2267,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 4e307c7585..70be6d4b9c 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2247,3 +2247,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index f1b0b369f0..208e8cc13b 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -2241,3 +2241,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE, "Limit the number of entries in recent playlist for games, images, music, and videos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, "Unified Menu Controls") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS, + "Use the same controls for both the menu and the game. Applies to the keyboard.") From d9eed42ba3ccc7de5963d218f67d185920d20b2c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 02:41:06 +0100 Subject: [PATCH 005/205] (msg_hash_it.c) Cleanups --- intl/msg_hash_it.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index c9155879cc..c2159671d6 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1227,41 +1227,16 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Aggiorna le info dei core"; case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER: return "Usa Media Player interno"; -#if 0 case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU: return "Menú orizzontale"; -#else - case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU: - return "Horizontal Menu"; -#endif -#if 0 case MENU_ENUM_LABEL_VALUE_SETTINGS_TAB: return "Settaggi scheda"; -#else - case MENU_ENUM_LABEL_VALUE_SETTINGS_TAB: - return "Settings tab"; -#endif -#if 0 case MENU_ENUM_LABEL_VALUE_HISTORY_TAB: return "Cronologia scheda"; -#else - case MENU_ENUM_LABEL_VALUE_HISTORY_TAB: - return "History tab"; -#endif -#if 1 - case MENU_ENUM_LABEL_VALUE_ADD_TAB: - return "Add tab"; -#else case MENU_ENUM_LABEL_VALUE_ADD_TAB: return "Aggiungi scheda"; -#endif -#if 0 case MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB: return "Scheda Playlist"; -#else - case MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB: - return "Playlists tab"; -#endif case MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND: return "Nessun settaggio trovato."; case MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS: @@ -1392,10 +1367,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Directory Shader Video"; case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR: return "Directory Filtro Video"; - case MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY: - return "Directory Overlay"; - case MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY: - return "Directory Overlay OSK"; case MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT: return "Giocatore 2 usa Controller 1 in rete"; case MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE: @@ -1532,10 +1503,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Intervallo di swap vsync"; case MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES: return "Massimo swapchain di immagini"; - case MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC: - return "VSync"; - case MENU_ENUM_LABEL_VALUE_VIDEO_THREADED: - return "Threaded Video"; case MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION: return "Rotazione"; case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT: @@ -1816,8 +1783,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Opzioni di rimappatura degli input del core"; case MENU_ENUM_LABEL_VALUE_THUMBNAILS: return "Miniature"; - case MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS: - return "Shaders"; case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS: return "Antemprima Parametri Shader"; case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS: From b087a7441a4e66efd1b5f06cc660599dd0f90b27 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 03:52:08 +0100 Subject: [PATCH 006/205] Fix game focus toggle --- input/input_driver.c | 7 +++++++ runloop.c | 13 ++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index f879ee20ea..45429306e4 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -585,6 +585,13 @@ uint64_t input_menu_keys_pressed( if (!current_input || !current_input_data) goto end; + if (settings->menu.unified_controls) + return input_keys_pressed( + old_input, + last_input, + trigger_input, + runloop_paused); + for (i = 0; i < settings->input.max_users; i++) { struct retro_keybind *auto_binds = settings->input.autoconf_binds[i]; diff --git a/runloop.c b/runloop.c index dd9326258b..29e413d7fe 100644 --- a/runloop.c +++ b/runloop.c @@ -1076,7 +1076,7 @@ static enum runloop_state runloop_check_state( return RUNLOOP_STATE_ITERATE; } -#define runloop_menu_unified_controls_pressed() (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) && settings->menu.unified_controls) +#define runloop_menu_unified_controls_pressed() (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) /** * runloop_iterate: @@ -1092,18 +1092,17 @@ int runloop_iterate(unsigned *sleep_ms) unsigned i; retro_time_t current, target, to_sleep_ms; uint64_t trigger_input = 0; - uint64_t current_input = 0; static uint64_t last_input = 0; settings_t *settings = config_get_ptr(); uint64_t old_input = last_input; + uint64_t current_input = #ifdef HAVE_MENU - if (!runloop_menu_unified_controls_pressed()) - current_input = input_menu_keys_pressed(old_input, - &last_input, &trigger_input, runloop_paused); - else + runloop_menu_unified_controls_pressed() ? + input_menu_keys_pressed(old_input, + &last_input, &trigger_input, runloop_paused) : #endif - current_input = input_keys_pressed(old_input, &last_input, + input_keys_pressed(old_input, &last_input, &trigger_input, runloop_paused); if (runloop_frame_time.callback) From acc0856a69bf6e5c183e55f74d69d8c38a1b01bc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 May 2006 13:17:58 +0200 Subject: [PATCH 007/205] (MSVC 2003) Buildfix --- config.def.h | 2 +- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.def.h b/config.def.h index 6a685e9437..cc7fd22b1f 100644 --- a/config.def.h +++ b/config.def.h @@ -917,7 +917,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ #elif defined(_WIN32) && !defined(_XBOX) #if defined(__x86_64__) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/"; -#elif defined(__i386__) || defined(__i486__) || defined(__i686__) +#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86/latest/"; #endif #elif defined(__linux__) diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index cc207e32c8..5c24d99ff2 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 +Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418 diff --git a/deps/glslang/glslang b/deps/glslang/glslang index 2eb0986f10..a4a4d5e22c 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440 +Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b From b4c1927e2747ea2b4f79e7c8d3c353c34467d421 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 May 2006 13:31:43 +0200 Subject: [PATCH 008/205] (MSVC 2003) Buildfixes --- network/netplay/netplay.c | 9 ++++++++- network/netplay/netplay_net.c | 9 ++++++++- ui/drivers/ui_win32.c | 4 ---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c index 9996e062f5..a716b5b79b 100644 --- a/network/netplay/netplay.c +++ b/network/netplay/netplay.c @@ -85,7 +85,14 @@ static int init_tcp_connection(const struct addrinfo *res, #if defined(IPPROTO_TCP) && defined(TCP_NODELAY) { int flag = 1; - if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(int)) < 0) + if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, +#ifdef _WIN32 + (const char*) +#else + (const void*) +#endif + &flag, + sizeof(int)) < 0) RARCH_WARN("Could not set netplay TCP socket to nodelay. Expect jitter.\n"); } #endif diff --git a/network/netplay/netplay_net.c b/network/netplay/netplay_net.c index a9472ef039..f9cb1c549f 100644 --- a/network/netplay/netplay_net.c +++ b/network/netplay/netplay_net.c @@ -139,7 +139,14 @@ static bool netplay_net_pre_frame(netplay_t *netplay) #if defined(IPPROTO_TCP) && defined(TCP_NODELAY) { int flag = 1; - if (setsockopt(netplay->fd, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(int)) < 0) + if (setsockopt(netplay->fd, IPPROTO_TCP, TCP_NODELAY, +#ifdef _WIN32 + (const char*) +#else + (const void*) +#endif + &flag, + sizeof(int)) < 0) RARCH_WARN("Could not set netplay TCP socket to nodelay. Expect jitter.\n"); } #endif diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index 8a22a54b75..41b5e99dbb 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -30,10 +30,6 @@ #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #endif -#ifndef _WIN32_IE -#define _WIN32_IE 0x0300 -#endif - #include "../../gfx/common/win32_common.h" #include #include From ff3841ed7c57e87406f5bb8ba783a00cf4006927 Mon Sep 17 00:00:00 2001 From: radius Date: Mon, 14 Nov 2016 21:03:46 -0500 Subject: [PATCH 009/205] get this building again --- ui/drivers/qt/wimp-test/main.cpp | 2 -- ui/drivers/qt/wimp-test/wimp-test.pro | 18 +++++----- ui/drivers/qt/wimp/main.qml | 48 --------------------------- ui/drivers/qt/wimp/wimp.cpp | 46 ++----------------------- ui/drivers/qt/wrapper/wrapper.h | 2 -- ui/drivers/qt/wrapper/wrapper.pro | 13 +++++--- 6 files changed, 20 insertions(+), 109 deletions(-) diff --git a/ui/drivers/qt/wimp-test/main.cpp b/ui/drivers/qt/wimp-test/main.cpp index 868dab39bc..0f8dac7fa8 100644 --- a/ui/drivers/qt/wimp-test/main.cpp +++ b/ui/drivers/qt/wimp-test/main.cpp @@ -37,8 +37,6 @@ int main(int argc, char *argv[]) Sleep(1000); printf("test = %d\n",i); i++; - if(j < 2) - t->SetTitle("test"); } pthread_join(gui,NULL); diff --git a/ui/drivers/qt/wimp-test/wimp-test.pro b/ui/drivers/qt/wimp-test/wimp-test.pro index ee2e70b720..d7d0e07fb3 100644 --- a/ui/drivers/qt/wimp-test/wimp-test.pro +++ b/ui/drivers/qt/wimp-test/wimp-test.pro @@ -8,13 +8,15 @@ win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lw else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll -INCLUDEPATH += $$PWD/../wimp/build/release -DEPENDPATH += $$PWD/../wimp/build/release +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.dll +else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.so +else:unix:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/debug/ -lwrapper.so +INCLUDEPATH += $$PWD/../../../../ +INCLUDEPATH += $$PWD/../../../../libretro-common/include/ -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wrapper/build/release/ -lwrapper.dll -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wrapper/build/debug/ -lwrapper.dll -else:unix: LIBS += -L$$PWD/../wrapper/build/ -lwrapper.dll - -INCLUDEPATH += $$PWD/../wrapper/build/release -DEPENDPATH += $$PWD/../wrapper/build/release +win32:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release +else:win32:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/debug +else:unix:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/release +else:unix:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release diff --git a/ui/drivers/qt/wimp/main.qml b/ui/drivers/qt/wimp/main.qml index 1ebcbfbf80..2223ded258 100644 --- a/ui/drivers/qt/wimp/main.qml +++ b/ui/drivers/qt/wimp/main.qml @@ -98,55 +98,7 @@ ApplicationWindow { } } - TabView { - id: tabView - anchors.fill: parent - currentIndex: page.selectedTab - model: sections - - delegate: Item { - width: tabView.width - height: tabView.height - clip: true - - Sidebar { - id: sidebar - - expanded: !navDrawer.enabled - - Column { - width: parent.width - - Repeater { - model: modelData - delegate: ListItem.Standard { - text: modelData - selected: modelData == selectedItem - onClicked: selectedItem = modelData - } - } - } - } - Flickable { - id: flickable - anchors { - left: sidebar.right - right: parent.right - top: parent.top - bottom: parent.bottom - } - clip: true - Column { - width: parent.width - } - - } - Scrollbar { - flickableItem: flickable - } - } - } } Dialog { diff --git a/ui/drivers/qt/wimp/wimp.cpp b/ui/drivers/qt/wimp/wimp.cpp index f6e54aa687..07df4f22bc 100644 --- a/ui/drivers/qt/wimp/wimp.cpp +++ b/ui/drivers/qt/wimp/wimp.cpp @@ -33,17 +33,11 @@ int Wimp::CreateMainWindow() topLevel = engine.rootObjects().value(0); window = qobject_cast(topLevel); - if(settings->playlist_directory[0] != '\0') - GetCollections(settings->playlist_directory); - else - collections.append("Collection dir not defined"); + collections.append("Collection dir not defined"); engine.rootContext()->setContextProperty("collections", QVariant::fromValue(collections)); - if(settings->libretro_directory[0] != '\0') - GetCores(settings->libretro_directory); - else - cores.append("Core dir not defined"); + cores.append("Core dir not defined"); engine.rootContext()->setContextProperty("cores", QVariant::fromValue(cores)); @@ -55,39 +49,3 @@ void Wimp::GetSettings(settings_t *s) { settings = s; } - -void Wimp::GetCollections(char* path) -{ - QDir dir(path); - dir.setNameFilters(QStringList(file_path_str(FILE_PATH_LPL_EXTENSION))); - QStringList fileList = dir.entryList(); - - if(fileList.count() == 0) - collections.append("Empty"); - - for (int i=0; i < fileList.count(); i++) - { - QString collection = fileList[i].section('.',0,0); - collections.append(collection); - qDebug() << "Found file: " << collection; - } - -} - -void Wimp::GetCores(char* path) -{ - QDir dir(path); - dir.setNameFilters(QStringList("*.dll")); - QStringList fileList = dir.entryList(); - - if(fileList.count() == 0) - cores.append("Empty"); - - for (int i=0; i < fileList.count(); i++) - { - QString core = fileList[i].section('.',0,0); - cores.append(core); - qDebug() << "Found file: " << core; - } - -} diff --git a/ui/drivers/qt/wrapper/wrapper.h b/ui/drivers/qt/wrapper/wrapper.h index ef8e9ab8f7..dc8fffd756 100644 --- a/ui/drivers/qt/wrapper/wrapper.h +++ b/ui/drivers/qt/wrapper/wrapper.h @@ -17,8 +17,6 @@ #define HAVE_MENU #endif -#include - #include "config.h" #include "configuration.h" diff --git a/ui/drivers/qt/wrapper/wrapper.pro b/ui/drivers/qt/wrapper/wrapper.pro index f03fbb4dbd..d1ecf5744f 100644 --- a/ui/drivers/qt/wrapper/wrapper.pro +++ b/ui/drivers/qt/wrapper/wrapper.pro @@ -14,12 +14,15 @@ HEADERS += \ wrapper.h -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lwimp.dll -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll -else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll +else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so +else:unix:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so -INCLUDEPATH += $$PWD/../wimp/build/release -DEPENDPATH += $$PWD/../wimp/build/release +win32:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release +else:win32:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/debug +else:unix:CONFIG(debug, debug|release): INCLUDEPATH += $$PWD/../build/release +else:unix:CONFIG(release, debug|release): INCLUDEPATH += $$PWD/../build/release INCLUDEPATH += $$PWD/../../../../ INCLUDEPATH += $$PWD/../../../../libretro-common/include/ From 26d0a6f2d02fb474260e802029a23d60ad8d7781 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 19 Nov 2016 20:18:44 -0500 Subject: [PATCH 010/205] simplify building --- Makefile.common | 13 +++++-------- qb/config.params.sh | 1 + ui/drivers/qt/wimp-test/wimp-test.pro | 17 ++++++++++++++--- ui/drivers/qt/wimp/wimp.pro | 11 +++++++++++ ui/drivers/qt/wrapper/wrapper.pro | 12 ++++++++++++ 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1944d4563a..fc22528afb 100644 --- a/Makefile.common +++ b/Makefile.common @@ -272,8 +272,12 @@ endif # Qt +ifeq ($(HAVE_QT_WRAPPER), 1) +LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/ +LIBS += -lwrapper +endif + ifeq ($(HAVE_QT), 1) -HAVE_QT_WRAPPER=0 OBJ += ui/drivers/ui_qt.o \ ui/drivers/qt/ui_qt_application.o \ ui/drivers/qt/ui_qt_window.o \ @@ -283,13 +287,6 @@ OBJ += ui/drivers/ui_qt.o \ ifneq ($(findstring Linux,$(OS)),) DEFINES += -I/usr/include/qt -fPIC endif - -# TODO/FIXME - figure out which libraries we need to link against -LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release - -ifeq ($(HAVE_QT_WRAPPER), 1) -LIBS += -lwrapper -endif endif ifeq ($(HAVE_SSA),1) diff --git a/qb/config.params.sh b/qb/config.params.sh index 61d5a41861..9efebba082 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -80,6 +80,7 @@ HAVE_PARPORT=auto # Parallel port joypad support HAVE_IMAGEVIEWER=yes # Built-in image viewer support. HAVE_MMAP=auto # MMAP support HAVE_QT=no # QT companion support +HAVE_QT_WRAPPER=no HAVE_XSHM=no # XShm video driver support HAVE_CHEEVOS=yes # Retro Achievements HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines diff --git a/ui/drivers/qt/wimp-test/wimp-test.pro b/ui/drivers/qt/wimp-test/wimp-test.pro index d7d0e07fb3..cd3966adf0 100644 --- a/ui/drivers/qt/wimp-test/wimp-test.pro +++ b/ui/drivers/qt/wimp-test/wimp-test.pro @@ -1,11 +1,22 @@ TARGET = wimp-test CONFIG += console - SOURCES += main.cpp -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lwimp.dll -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll +Release:DESTDIR = ../build/release +Release:OBJECTS_DIR = ../build/release/obj +Release:MOC_DIR = ../build/release/moc +Release:RCC_DIR = ../build/release/rcc +Release:UI_DIR = ../build/release/ui + +Debug:DESTDIR = ../build/debug +Debug:OBJECTS_DIR = ../build/debug/obj +Debug:MOC_DIR = ../build/debug/moc +Debug:RCC_DIR = ../build/debug/rcc +Debug:UI_DIR = ../build/debug/ui + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build/debug/ -lwimp.dll else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll diff --git a/ui/drivers/qt/wimp/wimp.pro b/ui/drivers/qt/wimp/wimp.pro index 5dbf8f3b93..4917f2c1ea 100644 --- a/ui/drivers/qt/wimp/wimp.pro +++ b/ui/drivers/qt/wimp/wimp.pro @@ -21,6 +21,17 @@ HEADERS +=\ RESOURCES += \ qml.qrc +Release:DESTDIR = ../build/release +Release:OBJECTS_DIR = ../build/release/obj +Release:MOC_DIR = ../build/release/moc +Release:RCC_DIR = ../build/release/rcc +Release:UI_DIR = ../build/release/ui + +Debug:DESTDIR = ../build/debug +Debug:OBJECTS_DIR = ../build/debug/obj +Debug:MOC_DIR = ../build/debug/moc +Debug:RCC_DIR = ../build/debug/rcc +Debug:UI_DIR = ../build/debug/ui INCLUDEPATH += $$PWD/../../../../ INCLUDEPATH += $$PWD/../../../../libretro-common/include/ diff --git a/ui/drivers/qt/wrapper/wrapper.pro b/ui/drivers/qt/wrapper/wrapper.pro index d1ecf5744f..cc4b69c9a8 100644 --- a/ui/drivers/qt/wrapper/wrapper.pro +++ b/ui/drivers/qt/wrapper/wrapper.pro @@ -14,6 +14,18 @@ HEADERS += \ wrapper.h +Release:DESTDIR = ../build/release +Release:OBJECTS_DIR = ../build/release/obj +Release:MOC_DIR = ../build/release/moc +Release:RCC_DIR = ../build/release/rcc +Release:UI_DIR = ../build/release/ui + +Debug:DESTDIR = ../build/debug +Debug:OBJECTS_DIR = ../build/debug/obj +Debug:MOC_DIR = ../build/debug/moc +Debug:RCC_DIR = ../build/debug/rcc +Debug:UI_DIR = ../build/debug/ui + win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so From fd84613db5dbd083baa74bcd2e5159ebe79df792 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 19 Nov 2016 21:19:56 -0500 Subject: [PATCH 011/205] get this working again --- Makefile.common | 3 ++- griffin/griffin_cpp.cpp | 4 ++++ ui/drivers/qt/wimp/main.qml | 2 +- ui/drivers/ui_qt.cpp | 14 ++++++++++++-- ui/ui_companion_driver.c | 3 +++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Makefile.common b/Makefile.common index fc22528afb..cab7d79d0c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -273,7 +273,8 @@ endif # Qt ifeq ($(HAVE_QT_WRAPPER), 1) -LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/ +OBJ += ui/drivers/ui_qt.o +LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/build/release/ LIBS += -lwrapper endif diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 80621c44a7..bbd0dbd3c9 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -152,6 +152,10 @@ UI #include "../ui/drivers/qt/ui_qt_application.cpp" #endif +#if defined(HAVE_QT_WRAPPER) +#include "../ui/drivers/ui_qt.cpp" +#endif + /*============================================================ VIDEO DRIVER ============================================================ */ diff --git a/ui/drivers/qt/wimp/main.qml b/ui/drivers/qt/wimp/main.qml index 2223ded258..5cb25d91d1 100644 --- a/ui/drivers/qt/wimp/main.qml +++ b/ui/drivers/qt/wimp/main.qml @@ -30,7 +30,7 @@ ApplicationWindow { initialPage: Page { id: page - title: "RetroArch" + title: "QT!" tabs: navDrawer.enabled ? [] : sectionTitles diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 09bdf2d204..e074b1d2dd 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -26,9 +26,12 @@ #include "../../config.h" #endif - -#include "ui_qt.h" +#ifdef HAVE_QT_WRAPPER #include "qt/wrapper/wrapper.h" +#else +#include "ui_qt.h" +#endif + #include "../ui_companion_driver.h" #include "../../core.h" #include "../../configuration.h" @@ -151,9 +154,16 @@ const ui_companion_driver_t ui_companion_qt = { NULL, NULL, NULL, +#ifdef HAVE_QT_WRAPPER + NULL, + NULL, + NULL, + NULL, +#else &ui_browser_window_qt, &ui_msg_window_qt, &ui_window_qt, &ui_application_qt, +#endif "qt", }; diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index 524cab6be3..6762f63ae2 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -28,6 +28,9 @@ static const ui_companion_driver_t *ui_companion_drivers[] = { +#ifdef HAVE_QT_WRAPPER + &ui_companion_qt, +#endif #if defined(_WIN32) && !defined(_XBOX) &ui_companion_win32, #endif From a49912c863a9402685a25c17fc86191b666203a6 Mon Sep 17 00:00:00 2001 From: markwkidd Date: Wed, 7 Dec 2016 15:35:49 -0500 Subject: [PATCH 012/205] accept playlists with Unix and Windows style line endings --- playlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/playlist.c b/playlist.c index 530296a7da..84631fd290 100644 --- a/playlist.c +++ b/playlist.c @@ -463,9 +463,13 @@ static bool playlist_read_file( if (!filestream_gets(file, buf[i], sizeof(buf[i]))) goto end; - last = strrchr(buf[i], '\n'); - if (last) + /* Read playlist entry regardless + * of Windows or Unix line endings + */ + if(last = strrchr(buf[i], '\r')) *last = '\0'; + else if(last = strrchr(buf[i], '\n')) + *last = '\0'; } entry = &playlist->entries[playlist->size]; From f710129f32862b1129b8cff2c452bc7f068bd4b3 Mon Sep 17 00:00:00 2001 From: markwkidd Date: Wed, 7 Dec 2016 15:51:09 -0500 Subject: [PATCH 013/205] cleaner to use strpbrk --- playlist.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/playlist.c b/playlist.c index 84631fd290..d1548df98d 100644 --- a/playlist.c +++ b/playlist.c @@ -466,10 +466,8 @@ static bool playlist_read_file( /* Read playlist entry regardless * of Windows or Unix line endings */ - if(last = strrchr(buf[i], '\r')) + if((last = strpbrk(buf[i], "\n\r"))) *last = '\0'; - else if(last = strrchr(buf[i], '\n')) - *last = '\0'; } entry = &playlist->entries[playlist->size]; From 72d31c6fbe6ead6b3e63b892d67331967ad0ed6b Mon Sep 17 00:00:00 2001 From: markwkidd Date: Wed, 7 Dec 2016 15:52:14 -0500 Subject: [PATCH 014/205] Update playlist.c --- playlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playlist.c b/playlist.c index d1548df98d..0de4958c7c 100644 --- a/playlist.c +++ b/playlist.c @@ -463,8 +463,8 @@ static bool playlist_read_file( if (!filestream_gets(file, buf[i], sizeof(buf[i]))) goto end; - /* Read playlist entry regardless - * of Windows or Unix line endings + /* Read playlist entry and terminate string with NULL + * regardless of Windows or Unix line endings */ if((last = strpbrk(buf[i], "\n\r"))) *last = '\0'; From e65b4d8c1c4581d7f4a38ed92dcfd508cd46128f Mon Sep 17 00:00:00 2001 From: markwkidd Date: Wed, 7 Dec 2016 16:07:45 -0500 Subject: [PATCH 015/205] Update playlist.c --- playlist.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/playlist.c b/playlist.c index 0de4958c7c..43a33078e9 100644 --- a/playlist.c +++ b/playlist.c @@ -465,9 +465,12 @@ static bool playlist_read_file( /* Read playlist entry and terminate string with NULL * regardless of Windows or Unix line endings - */ - if((last = strpbrk(buf[i], "\n\r"))) - *last = '\0'; + */ + if(last = strrchr(buf[i], '\r')) + *last = '\0'; + *last = '\0'; + else if(last = strrchr(buf[i], '\n')) + *last = '\0'; } entry = &playlist->entries[playlist->size]; From edf58d9e2987d1a3b2c31aa1ce0378eaa805cced Mon Sep 17 00:00:00 2001 From: markwkidd Date: Wed, 7 Dec 2016 16:08:09 -0500 Subject: [PATCH 016/205] Update playlist.c --- playlist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/playlist.c b/playlist.c index 43a33078e9..c777fe11a4 100644 --- a/playlist.c +++ b/playlist.c @@ -468,7 +468,6 @@ static bool playlist_read_file( */ if(last = strrchr(buf[i], '\r')) *last = '\0'; - *last = '\0'; else if(last = strrchr(buf[i], '\n')) *last = '\0'; } From c6bc316e0471fec837109df9ef4c4e80c49ce9ba Mon Sep 17 00:00:00 2001 From: markwkidd Date: Sat, 10 Dec 2016 11:03:28 -0500 Subject: [PATCH 017/205] Update playlist.c --- playlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playlist.c b/playlist.c index c777fe11a4..42ee42f064 100644 --- a/playlist.c +++ b/playlist.c @@ -466,9 +466,9 @@ static bool playlist_read_file( /* Read playlist entry and terminate string with NULL * regardless of Windows or Unix line endings */ - if(last = strrchr(buf[i], '\r')) + if((last = strrchr(buf[i], '\r'))) *last = '\0'; - else if(last = strrchr(buf[i], '\n')) + else if((last = strrchr(buf[i], '\n'))) *last = '\0'; } From f2e30ec5e9fb69c5945d8384538da0df656fc106 Mon Sep 17 00:00:00 2001 From: lasers Date: Sat, 10 Dec 2016 12:56:13 -0600 Subject: [PATCH 018/205] Add sublabel for Achievements (enable,test_unofficial) --- intl/msg_hash_eo.h | 4 ++++ intl/msg_hash_fr.h | 4 ++++ intl/msg_hash_ja.h | 4 ++++ intl/msg_hash_nl.h | 4 ++++ intl/msg_hash_ru.h | 4 ++++ intl/msg_hash_us.h | 4 ++++ menu/cbs/menu_cbs_sublabel.c | 8 ++++++++ 7 files changed, 32 insertions(+) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index b9b977abae..bbe0bb4ba6 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1614,6 +1614,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Yes") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "Shader Preset") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 4ab101dc48..2396ee4208 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1582,6 +1582,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Oui") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "Shader Preset") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 176511849b..4ead3d31ca 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1636,6 +1636,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "はい") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "シェーダーのプリセット") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "保存状態、チート、巻き戻し、早送り、一時停止、スローモーションを全部のゲームに無効する。") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 88f4d220ce..f40cca9559 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -1614,6 +1614,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Ja") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "Shader Preset") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 3ad22dafba..129b7b4904 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1610,6 +1610,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Yes") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "Shader Preset") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 87f3c73d79..055c2e31c6 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1632,6 +1632,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YES, "Yes") MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, "Shader Preset") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE, + "Enable or disable achievements. For more information, visit http://retroachievements.org") +MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL, + "Enable or disable unofficial achievements and/or beta features for testing purposes.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, "Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 3ac217bd68..bae847c563 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -50,6 +50,8 @@ default_sublabel_macro(action_bind_sublabel_frame_throttle_settings_list, MENU_ default_sublabel_macro(action_bind_sublabel_onscreen_display_settings_list,MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS) default_sublabel_macro(action_bind_sublabel_core_settings_list, MENU_ENUM_SUBLABEL_CORE_SETTINGS) default_sublabel_macro(action_bind_sublabel_information_list_list, MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST) +default_sublabel_macro(action_bind_sublabel_cheevos_enable, MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE) +default_sublabel_macro(action_bind_sublabel_cheevos_test_unofficial, MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL) default_sublabel_macro(action_bind_sublabel_cheevos_hardcore_mode_enable, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE) default_sublabel_macro(action_bind_sublabel_menu_settings_list, MENU_ENUM_SUBLABEL_MENU_SETTINGS) default_sublabel_macro(action_bind_sublabel_video_settings_list, MENU_ENUM_SUBLABEL_VIDEO_SETTINGS) @@ -219,6 +221,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_entry); break; + case MENU_ENUM_LABEL_CHEEVOS_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_enable); + break; + case MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_test_unofficial); + break; case MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_hardcore_mode_enable); break; From 8bf8652fb8393737d0f6464e91f4efc201cdd770 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Sat, 10 Dec 2016 18:33:15 -0200 Subject: [PATCH 019/205] README.md: minor stylistic changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 444d9985c4..efc908770d 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,11 @@ interface to include support for emulators and/or game engines. libretro is comp ## Binaries -Latest Windows binaries are currently hosted on the buildbot -(http://buildbot.libretro.com/). +Latest Windows binaries are currently hosted on the [buildbot](http://buildbot.libretro.com/). ## Support -To reach developers, either make an issue here on Github, make a thread on the [forum](http://www.libretro.com/forums/), +To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), or visit our IRC channel: #retroarch @ irc.freenode.org. ## Documentation From 26fe408bb415b4b6cf837179312119ca4f16a892 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Dec 2016 22:01:28 +0100 Subject: [PATCH 020/205] (Emscripten) Add button --- pkg/emscripten/itch/index.html | 4 ++++ pkg/emscripten/libretro/index.html | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkg/emscripten/itch/index.html b/pkg/emscripten/itch/index.html index bcd52fcddd..e16e0cd527 100644 --- a/pkg/emscripten/itch/index.html +++ b/pkg/emscripten/itch/index.html @@ -131,5 +131,9 @@ +
+ + +
diff --git a/pkg/emscripten/libretro/index.html b/pkg/emscripten/libretro/index.html index 855a69489e..89ecbe4eef 100644 --- a/pkg/emscripten/libretro/index.html +++ b/pkg/emscripten/libretro/index.html @@ -148,5 +148,9 @@ +
+ + +
From 86c76999da0770cd3ddc3d4b71bef26820228973 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Sat, 10 Dec 2016 19:02:39 -0200 Subject: [PATCH 021/205] README.md: Replace HTML with Markdown syntax --- README.md | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index efc908770d..14d74eb630 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ [![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch) - - Coverity Scan Build Status - +[![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch) # RetroArch @@ -119,10 +116,10 @@ A sample configuration file is installed to /etc/retroarch.cfg. This is the syst RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't exist. Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h. -To configure joypads, use the built-in menu or the retroarch-joyconfig command-line tool. +To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool. ## Compiling and installing -Linux
+**Linux** - Prerequisites: ```bash sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev @@ -133,7 +130,7 @@ sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeg make ``` -Mac
+**Mac** - Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download). - You can open the project (**pkg/apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**⌘-B**) and run (**⌘-R**) it there. Or you can use the command line... - Debug: @@ -151,62 +148,62 @@ xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch open ./pkg/apple/build/Release/RetroArch.app/ ``` -PC
+**PC** Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki). -PlayStation 3
+**PlayStation 3** RetroArch PS3 needs to be compiled in the following order: 1) Compile RetroArch Salamander -make -f Makefile.ps3.salamander + make -f Makefile.ps3.salamander 2) Finally, compile RetroArch packed together with the GUI: -make -f Makefile.ps3 + make -f Makefile.ps3 -PlayStation 3 - Creating a PKG installable file
+**PlayStation 3 - Creating a PKG installable file** You can add `pkg` as a parameter in order to make a PKG file - for example: -make -f Makefile.ps3 pkg + make -f Makefile.ps3 pkg This creates an NPDRM package. This can be installed on debug PS3s. To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do: -make -f Makefile.ps3 pkg-signed + make -f Makefile.ps3 pkg-signed If you're using Kmeaw 3.55 firmware, the package needs to be signed: -make -f Makefile.ps3 pkg-signed-cfw + make -f Makefile.ps3 pkg-signed-cfw -NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called `libretro_ps3.a`. +NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called ***`libretro_ps3.a`***. - Xbox 360 (XeXDK)
+**Xbox 360 (XeXDK)** You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360. The solution file can be found at the following location: -pkg/msvc-360/RetroArch-360.sln + pkg/msvc-360/RetroArch-360.sln NOTE: A pre-existing libretro library needs to be present in the `pkg/msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be -called `libretro_xdk360.lib`. +called ***`libretro_xdk360.lib`***. - Xbox 360 (Libxenon)
+**Xbox 360 (Libxenon)** You will need to have the libxenon libraries and a working Devkit Xenon toolchain installed in order to compile RetroArch 360 Libxenon. -make -f Makefile.xenon + make -f Makefile.xenon -NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called `libretro_xenon360.a`. +NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called ***`libretro_xenon360.a`***. - Wii
+**Wii** You will need to have the libogc libraries and a working Devkit PPC toolchain installed in order to compile RetroArch Wii. -make -f Makefile.griffin platform=wii + make -f Makefile.griffin platform=wii -NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called `libretro_wii.a`. +NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called ***`libretro_wii.a`***. From a47dd2175113a2a323f0738693a47c624d95684f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 06:39:30 +0100 Subject: [PATCH 022/205] Don't print game focus OSD message if input is -1 --- command.c | 21 +++++++++++++-------- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/command.c b/command.c index 8111fbcda8..7f2193bcaf 100644 --- a/command.c +++ b/command.c @@ -294,7 +294,7 @@ static const struct cmd_map map[] = { { "DISK_NEXT", RARCH_DISK_NEXT }, { "DISK_PREV", RARCH_DISK_PREV }, { "GRAB_MOUSE_TOGGLE", RARCH_GRAB_MOUSE_TOGGLE }, - { "GAME_FOCUS_TOGGLE", RARCH_GAME_FOCUS_TOGGLE }, + { "GAME_FOCUS_TOGGLE", RARCH_GAME_FOCUS_TOGGLE }, { "MENU_TOGGLE", RARCH_MENU_TOGGLE }, { "MENU_UP", RETRO_DEVICE_ID_JOYPAD_UP }, { "MENU_DOWN", RETRO_DEVICE_ID_JOYPAD_DOWN }, @@ -2500,7 +2500,7 @@ bool command_event(enum event_command cmd, void *data) case CMD_EVENT_GAME_FOCUS_TOGGLE: { static bool game_focus_state = false; - long int mode = (long int)data; + long int mode = (long int)data; /* mode = -1: restores current game focus state * mode = 1: force set game focus, instead of toggling @@ -2515,20 +2515,25 @@ bool command_event(enum event_command cmd, void *data) "Game focus is: ", game_focus_state ? "on" : "off"); - if (game_focus_state) { + if (game_focus_state) + { input_driver_grab_mouse(); video_driver_hide_mouse(); input_driver_set_hotkey_block(); input_driver_keyboard_mapping_set_block(1); - runloop_msg_queue_push(msg_hash_to_str(MSG_GAME_FOCUS_ON), - 1, 120, true); - } else { + if (mode != -1) + runloop_msg_queue_push(msg_hash_to_str(MSG_GAME_FOCUS_ON), + 1, 120, true); + } + else + { input_driver_ungrab_mouse(); video_driver_show_mouse(); input_driver_unset_hotkey_block(); input_driver_keyboard_mapping_set_block(0); - runloop_msg_queue_push(msg_hash_to_str(MSG_GAME_FOCUS_OFF), - 1, 120, true); + if (mode != -1) + runloop_msg_queue_push(msg_hash_to_str(MSG_GAME_FOCUS_OFF), + 1, 120, true); } } diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index 5c24d99ff2..cc207e32c8 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418 +Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 diff --git a/deps/glslang/glslang b/deps/glslang/glslang index a4a4d5e22c..2eb0986f10 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b +Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440 From 7dcea505fb0ebad64e2227b4b738668058b20536 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 06:40:33 +0100 Subject: [PATCH 023/205] Update SPIRV-Cross subrepo --- deps/SPIRV-Cross | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index cc207e32c8..875c32fd39 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 +Subproject commit 875c32fd39a06f624814effe5eab691b078429f5 From 1d9c9f802127c4c29654c946fd422f1f98a1c061 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 06:49:48 +0100 Subject: [PATCH 024/205] Update subrepos --- deps/glslang/glslang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/glslang/glslang b/deps/glslang/glslang index 2eb0986f10..be8462149a 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440 +Subproject commit be8462149a3c150fc89db84e57ef06de3ab90d47 From 423578d972188576866b956cfdeec92facce8293 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 07:28:33 +0100 Subject: [PATCH 025/205] (Joypad drivers) Simplify hat code --- input/drivers_joypad/android_joypad.c | 9 ++++++--- input/drivers_joypad/dinput_joypad.c | 8 ++++++-- input/drivers_joypad/sdl_joypad.c | 13 ++++++++----- input/drivers_joypad/udev_joypad.c | 10 ++++++---- input/drivers_joypad/xinput_joypad.c | 9 ++++++--- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/input/drivers_joypad/android_joypad.c b/input/drivers_joypad/android_joypad.c index aadc90f52b..b3af92c0a3 100644 --- a/input/drivers_joypad/android_joypad.c +++ b/input/drivers_joypad/android_joypad.c @@ -31,19 +31,22 @@ static bool android_joypad_init(void *data) static bool android_joypad_button(unsigned port, uint16_t joykey) { - uint8_t *buf = android_keyboard_state_get(port); + unsigned hat_dir = 0; + uint8_t *buf = android_keyboard_state_get(port); struct android_app *android_app = (struct android_app*)g_android; if (port >= MAX_PADS) return false; - if (GET_HAT_DIR(joykey)) + hat_dir = GET_HAT_DIR(joykey); + + if (hat_dir) { unsigned h = GET_HAT(joykey); if (h > 0) return false; - switch (GET_HAT_DIR(joykey)) + switch (hat_dir) { case HAT_LEFT_MASK: return android_app->hat_state[port][0] == -1; diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index 174da9f086..db5db60810 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -325,6 +325,7 @@ static bool dinput_joypad_init(void *data) static bool dinput_joypad_button(unsigned port_num, uint16_t joykey) { const struct dinput_joypad *pad = NULL; + unsigned hat_dir = 0; if (joykey == NO_BTN) return false; @@ -333,8 +334,11 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey) if (!pad->joypad) return false; + hat_dir = GET_HAT_DIR(joykey); + /* Check hat. */ - if (GET_HAT_DIR(joykey)) + + if (hat_dir) { unsigned pov; unsigned hat = GET_HAT(joykey); @@ -349,7 +353,7 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey) /* Magic numbers I'm not sure where originate from. */ if (pov < 36000) { - switch (GET_HAT_DIR(joykey)) + switch (hat_dir) { case HAT_UP_MASK: return (pov >= 31500) || (pov <= 4500); diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c index 705f8b3ff8..59e7c69b86 100644 --- a/input/drivers_joypad/sdl_joypad.c +++ b/input/drivers_joypad/sdl_joypad.c @@ -290,6 +290,8 @@ error: static bool sdl_joypad_button(unsigned port, uint16_t joykey) { sdl_joypad_t *pad = NULL; + unsigned hat_dir = 0; + if (joykey == NO_BTN) return false; @@ -297,17 +299,19 @@ static bool sdl_joypad_button(unsigned port, uint16_t joykey) if (!pad->joypad) return false; + hat_dir = GET_HAT_DIR(joykey); /* Check hat. */ - if (GET_HAT_DIR(joykey)) + if (hat_dir) { uint8_t dir; uint16_t hat = GET_HAT(joykey); + if (hat >= pad->num_hats) return false; dir = sdl_pad_get_hat(pad, hat); - switch (GET_HAT_DIR(joykey)) + switch (hat_dir) { case HAT_UP_MASK: return dir & SDL_HAT_UP; @@ -333,7 +337,7 @@ static bool sdl_joypad_button(unsigned port, uint16_t joykey) static int16_t sdl_joypad_axis(unsigned port, uint32_t joyaxis) { sdl_joypad_t *pad; - int16_t val; + int16_t val = 0; if (joyaxis == AXIS_NONE) return 0; @@ -342,7 +346,6 @@ static int16_t sdl_joypad_axis(unsigned port, uint32_t joyaxis) if (!pad->joypad) return false; - val = 0; if (AXIS_NEG_GET(joyaxis) < pad->num_axes) { val = sdl_pad_get_axis(pad, AXIS_NEG_GET(joyaxis)); @@ -391,9 +394,9 @@ static void sdl_joypad_poll(void) #ifdef HAVE_SDL2 static bool sdl_joypad_set_rumble(unsigned pad, enum retro_rumble_effect effect, uint16_t strength) { + SDL_HapticEffect efx; sdl_joypad_t *joypad = (sdl_joypad_t*)&sdl_pads[pad]; - SDL_HapticEffect efx; memset(&efx, 0, sizeof(efx)); if (!joypad->joypad || !joypad->haptic) diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index 5374cde59e..fe4e0fff3e 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -561,14 +561,15 @@ error: return false; } -static bool udev_joypad_hat(const struct udev_joypad *pad, uint16_t hat) +static bool udev_joypad_hat(const struct udev_joypad *pad, uint16_t hat, + unsigned hat_dir) { unsigned h = GET_HAT(hat); if (h >= NUM_HATS) return false; - switch (GET_HAT_DIR(hat)) + switch (hat_dir) { case HAT_LEFT_MASK: return pad->hats[h][0] < 0; @@ -586,9 +587,10 @@ static bool udev_joypad_hat(const struct udev_joypad *pad, uint16_t hat) static bool udev_joypad_button(unsigned port, uint16_t joykey) { const struct udev_joypad *pad = (const struct udev_joypad*)&udev_pads[port]; + unsigned hat_dir = GET_HAT_DIR(joykey); - if (GET_HAT_DIR(joykey)) - return udev_joypad_hat(pad, joykey); + if (hat_dir) + return udev_joypad_hat(pad, joykey, hat_dir); return joykey < UDEV_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey); } diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c index 8959b027ac..2f790ab814 100644 --- a/input/drivers_joypad/xinput_joypad.c +++ b/input/drivers_joypad/xinput_joypad.c @@ -318,9 +318,10 @@ static const uint16_t button_index_to_bitmap_code[] = { static bool xinput_joypad_button(unsigned port_num, uint16_t joykey) { - uint16_t btn_word; int xuser; + uint16_t btn_word = 0; unsigned num_buttons = 0; + unsigned hat_dir = 0; if (joykey == NO_BTN) return false; @@ -333,10 +334,11 @@ static bool xinput_joypad_button(unsigned port_num, uint16_t joykey) return false; btn_word = g_xinput_states[xuser].xstate.Gamepad.wButtons; + hat_dir = GET_HAT_DIR(joykey); - if (GET_HAT_DIR(joykey)) + if (hat_dir) { - switch (GET_HAT_DIR(joykey)) + switch (hat_dir) { case HAT_UP_MASK: return btn_word & XINPUT_GAMEPAD_DPAD_UP; @@ -347,6 +349,7 @@ static bool xinput_joypad_button(unsigned port_num, uint16_t joykey) case HAT_RIGHT_MASK: return btn_word & XINPUT_GAMEPAD_DPAD_RIGHT; } + return false; /* hat requested and no hat button down. */ } From 37559c6f5f0f42c153a8188ff87f12ae69a434d6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 08:31:55 +0100 Subject: [PATCH 026/205] Cleanups --- input/drivers_joypad/udev_joypad.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index fe4e0fff3e..2742df04a4 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -561,10 +561,10 @@ error: return false; } -static bool udev_joypad_hat(const struct udev_joypad *pad, uint16_t hat, - unsigned hat_dir) +static bool udev_joypad_button_hat(const void *data, uint16_t joykey, unsigned hat_dir) { - unsigned h = GET_HAT(hat); + const struct udev_joypad *pad = (const struct udev_joypad*)data; + unsigned h = GET_HAT(joykey); if (h >= NUM_HATS) return false; @@ -590,7 +590,7 @@ static bool udev_joypad_button(unsigned port, uint16_t joykey) unsigned hat_dir = GET_HAT_DIR(joykey); if (hat_dir) - return udev_joypad_hat(pad, joykey, hat_dir); + return udev_joypad_button_hat(pad, joykey, hat_dir); return joykey < UDEV_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey); } From e9f853ba93a24361add4442dca9a2b795ee24e17 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 08:44:55 +0100 Subject: [PATCH 027/205] Move (joykey == NO_BTN ) to input_joypad_driver --- input/drivers_hid/btstack_hid.c | 3 --- input/drivers_hid/iohidmanager_hid.c | 3 --- input/drivers_hid/libusb_hid.c | 3 --- input/drivers_hid/wiiusb_hid.c | 3 --- input/drivers_joypad/dinput_joypad.c | 9 ++------- input/drivers_joypad/mfi_joypad.m | 3 --- input/drivers_joypad/sdl_joypad.c | 9 ++------- input/drivers_joypad/xinput_joypad.c | 6 +----- input/input_joypad_driver.c | 2 +- 9 files changed, 6 insertions(+), 35 deletions(-) diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c index 8eecfa613d..7ccab02f02 100644 --- a/input/drivers_hid/btstack_hid.c +++ b/input/drivers_hid/btstack_hid.c @@ -1372,9 +1372,6 @@ static bool btstack_hid_joypad_button(void *data, unsigned port, uint16_t joykey { uint64_t buttons = btstack_hid_joypad_get_buttons(data, port); - if (joykey == NO_BTN) - return false; - /* Check hat. */ if (GET_HAT_DIR(joykey)) return false; diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c index 3948f111e9..45ff008eb6 100644 --- a/input/drivers_hid/iohidmanager_hid.c +++ b/input/drivers_hid/iohidmanager_hid.c @@ -73,9 +73,6 @@ static bool iohidmanager_hid_joypad_button(void *data, iohidmanager_hid_joypad_get_buttons(data, port); iohidmanager_hid_t *hid = (iohidmanager_hid_t*)data; - if (joykey == NO_BTN) - return false; - /* Check hat. */ if (GET_HAT_DIR(joykey)) return false; diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c index b6ee3834d8..285e525a68 100644 --- a/input/drivers_hid/libusb_hid.c +++ b/input/drivers_hid/libusb_hid.c @@ -442,9 +442,6 @@ static bool libusb_hid_joypad_button(void *data, { uint64_t buttons = libusb_hid_joypad_get_buttons(data, port); - if (joykey == NO_BTN) - return false; - /* Check hat. */ if (GET_HAT_DIR(joykey)) return false; diff --git a/input/drivers_hid/wiiusb_hid.c b/input/drivers_hid/wiiusb_hid.c index d09f6d6c8c..386ad9a37d 100644 --- a/input/drivers_hid/wiiusb_hid.c +++ b/input/drivers_hid/wiiusb_hid.c @@ -493,9 +493,6 @@ static bool wiiusb_hid_joypad_button(void *data, unsigned port, uint16_t joykey) { uint64_t buttons = wiiusb_hid_joypad_get_buttons(data, port); - if (joykey == NO_BTN) - return false; - /* Check hat. */ if (GET_HAT_DIR(joykey)) return false; diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index db5db60810..36a2133b20 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -324,14 +324,9 @@ static bool dinput_joypad_init(void *data) static bool dinput_joypad_button(unsigned port_num, uint16_t joykey) { - const struct dinput_joypad *pad = NULL; unsigned hat_dir = 0; - - if (joykey == NO_BTN) - return false; - - pad = &g_pads[port_num]; - if (!pad->joypad) + const struct dinput_joypad *pad = &g_pads[port_num]; + if (!pad || !pad->joypad) return false; hat_dir = GET_HAT_DIR(joykey); diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m index 377cea81a6..7349507812 100644 --- a/input/drivers_joypad/mfi_joypad.m +++ b/input/drivers_joypad/mfi_joypad.m @@ -207,9 +207,6 @@ static void apple_gamecontroller_joypad_destroy(void) static bool apple_gamecontroller_joypad_button(unsigned port, uint16_t joykey) { - if (joykey == NO_BTN) - return false; - /* Check hat. */ if (GET_HAT_DIR(joykey)) return false; diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c index 59e7c69b86..9681000095 100644 --- a/input/drivers_joypad/sdl_joypad.c +++ b/input/drivers_joypad/sdl_joypad.c @@ -289,14 +289,9 @@ error: static bool sdl_joypad_button(unsigned port, uint16_t joykey) { - sdl_joypad_t *pad = NULL; unsigned hat_dir = 0; - - if (joykey == NO_BTN) - return false; - - pad = (sdl_joypad_t*)&sdl_pads[port]; - if (!pad->joypad) + sdl_joypad_t *pad = (sdl_joypad_t*)&sdl_pads[port]; + if (!pad || !pad->joypad) return false; hat_dir = GET_HAT_DIR(joykey); diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c index 2f790ab814..7f8166fac6 100644 --- a/input/drivers_joypad/xinput_joypad.c +++ b/input/drivers_joypad/xinput_joypad.c @@ -318,15 +318,11 @@ static const uint16_t button_index_to_bitmap_code[] = { static bool xinput_joypad_button(unsigned port_num, uint16_t joykey) { - int xuser; uint16_t btn_word = 0; unsigned num_buttons = 0; unsigned hat_dir = 0; + int xuser = pad_index_to_xuser_index(port_num); - if (joykey == NO_BTN) - return false; - - xuser = pad_index_to_xuser_index(port_num); if (xuser == -1) return dinput_joypad.button(port_num, joykey); diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c index 2aa4f9f898..216859e50c 100644 --- a/input/input_joypad_driver.c +++ b/input/input_joypad_driver.c @@ -250,7 +250,7 @@ bool input_joypad_pressed( uint64_t joykey = (binds[key].joykey != NO_BTN) ? binds[key].joykey : auto_binds[key].joykey; - if (!drv->button(joy_idx, (uint16_t)joykey)) + if ((uint16_t)joykey == NO_BTN || !drv->button(joy_idx, (uint16_t)joykey)) { uint32_t joyaxis = (binds[key].joyaxis != AXIS_NONE) ? binds[key].joyaxis : auto_binds[key].joyaxis; From d2bd6677bd1633a9c9c3a90fd28aaffb13d56220 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 08:48:25 +0100 Subject: [PATCH 028/205] (udev_joypad.c) Cleanup --- input/drivers_joypad/udev_joypad.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index 2742df04a4..16274a0ee9 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -83,8 +83,8 @@ struct udev_joypad int32_t pid; }; -static struct udev *udev_joypad_fd; -static struct udev_monitor *udev_joypad_mon; +static struct udev *udev_joypad_fd = NULL; +static struct udev_monitor *udev_joypad_mon = NULL; static struct udev_joypad udev_pads[MAX_USERS]; static INLINE int16_t udev_compute_axis(const struct input_absinfo *info, int value) @@ -289,8 +289,10 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char settings->input.pid[p] = params.pid; settings->input.vid[p] = params.vid; - strlcpy(settings->input.device_names[p], params.name, sizeof(settings->input.device_names[p])); - strlcpy(params.driver, udev_joypad.ident, sizeof(params.driver)); + strlcpy(settings->input.device_names[p], + params.name, sizeof(settings->input.device_names[p])); + strlcpy(params.driver, udev_joypad.ident, + sizeof(params.driver)); input_autoconfigure_connect(¶ms); ret = 1; @@ -304,7 +306,9 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char p, path); if (ioctl(fd, EVIOCGEFFECTS, &pad->num_effects) >= 0) - RARCH_LOG("[udev]: Pad #%u (%s) supports %d force feedback effects.\n", p, path, pad->num_effects); + RARCH_LOG( + "[udev]: Pad #%u (%s) supports %d force feedback effects.\n", + p, path, pad->num_effects); } return ret; @@ -324,7 +328,9 @@ static void udev_check_device(struct udev_device *dev, const char *path) { if (st.st_rdev == udev_pads[i].device) { - RARCH_LOG("[udev]: Device ID %u is already plugged.\n", (unsigned)st.st_rdev); + RARCH_LOG( + "[udev]: Device ID %u is already plugged.\n", + (unsigned)st.st_rdev); return; } } @@ -427,7 +433,8 @@ end: udev_device_unref(dev); } -static bool udev_set_rumble(unsigned i, enum retro_rumble_effect effect, uint16_t strength) +static bool udev_set_rumble(unsigned i, + enum retro_rumble_effect effect, uint16_t strength) { int old_effect; uint16_t old_strength; @@ -530,7 +537,8 @@ static bool udev_joypad_init(void *data) udev_joypad_mon = udev_monitor_new_from_netlink(udev_joypad_fd, "udev"); if (udev_joypad_mon) { - udev_monitor_filter_add_match_subsystem_devtype(udev_joypad_mon, "input", NULL); + udev_monitor_filter_add_match_subsystem_devtype( + udev_joypad_mon, "input", NULL); udev_monitor_enable_receiving(udev_joypad_mon); } From 15c63c3de93dfff455ab4aadb8d3047cf051bc1b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 09:13:24 +0100 Subject: [PATCH 029/205] (input_driver.c) Cleanups --- input/input_driver.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 45429306e4..8d26bcd004 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -499,6 +499,7 @@ static INLINE bool input_menu_keys_pressed_internal(unsigned i) { int port; int port_max = 1; + if (settings->input.all_users_control_menu) port_max = settings->input.max_users; @@ -509,16 +510,10 @@ static INLINE bool input_menu_keys_pressed_internal(unsigned i) const input_device_driver_t *sec = current_input->get_sec_joypad_driver ? current_input->get_sec_joypad_driver(current_input_data) : NULL; - if (sec) - { - if (input_joypad_pressed(sec, port, settings->input.binds[0], i)) - return true; - } - if (first) - { - if (input_joypad_pressed(first, port, settings->input.binds[0], i)) - return true; - } + if (sec && input_joypad_pressed(sec, port, settings->input.binds[0], i)) + return true; + if (first && input_joypad_pressed(first, port, settings->input.binds[0], i)) + return true; } } @@ -790,17 +785,17 @@ uint64_t input_keys_pressed( bool runloop_paused) { unsigned i; - uint64_t ret = 0; - settings_t *settings = config_get_ptr(); - const struct retro_keybind *binds = settings->input.binds[0]; - const struct retro_keybind *binds_auto = &settings->input.autoconf_binds[0][RARCH_ENABLE_HOTKEY]; - const struct retro_keybind *normal = &binds[RARCH_ENABLE_HOTKEY]; + uint64_t ret = 0; + settings_t *settings = config_get_ptr(); + const struct retro_keybind *binds = settings->input.binds[0]; + const struct retro_keybind *binds_auto = &settings->input.autoconf_binds[0][RARCH_ENABLE_HOTKEY]; + const struct retro_keybind *normal = &binds[RARCH_ENABLE_HOTKEY]; const struct retro_keybind *focus_binds_auto = &settings->input.autoconf_binds[0][RARCH_GAME_FOCUS_TOGGLE]; const struct retro_keybind *focus_normal = &binds[RARCH_GAME_FOCUS_TOGGLE]; - input_driver_block_libretro_input = false; - input_driver_block_hotkey = false; + input_driver_block_libretro_input = false; + input_driver_block_hotkey = false; /* Don't block the check to RARCH_ENABLE_HOTKEY * unless we're really supposed to. */ From a5a594f619bed1715f3619ed81976a0caef3f8f0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 10:34:12 +0100 Subject: [PATCH 030/205] Don't push screenshot to image history if we are just saving a state --- tasks/task_screenshot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index 11e533df29..d80479cac2 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -74,6 +74,7 @@ typedef struct unsigned height; int pitch; bool bgr24; + bool silence; void *userbuf; } screenshot_task_state_t; @@ -152,7 +153,7 @@ static void task_screenshot_handler(retro_task_t *task) #endif #ifdef HAVE_IMAGEVIEWER - if (ret) + if (ret && !state->silence) if (content_push_to_history_playlist(g_defaults.image_history, state->filename, "imageviewer", "builtin")) @@ -192,6 +193,7 @@ static bool screenshot_dump( state->pitch = pitch; state->frame = frame; state->userbuf = userbuf; + state->silence = savestate; if (savestate) { From ad273d6299d68ccff50c5ee2449cfebfe999c52c Mon Sep 17 00:00:00 2001 From: barbudreadmon Date: Sun, 11 Dec 2016 10:53:02 +0100 Subject: [PATCH 031/205] Fix for issue #4165 vulkan video driver don't rotate the same way as gl video driver without this. --- gfx/drivers/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 2397aeed84..153b94a614 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -1282,7 +1282,7 @@ static void vulkan_set_rotation(void *data, unsigned rotation) if (!vk) return; - vk->rotation = 90 * rotation; + vk->rotation = 270 * rotation; vulkan_set_projection(vk, &ortho, true); } From 14c5bdc0a119a8c2cae54e75028dcafd43beffe6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 10:59:15 +0100 Subject: [PATCH 032/205] Put some settings behind SD_FLAG_ADVANCED --- menu/menu_setting.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 1fc9357c0f..39f4b32456 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2972,7 +2972,7 @@ static bool setting_append_list( bool_entries[6].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE; bool_entries[6].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE; bool_entries[6].default_value = savestate_thumbnail_enable; - bool_entries[6].flags = SD_FLAG_NONE; + bool_entries[6].flags = SD_FLAG_ADVANCED; for (i = 0; i < ARRAY_SIZE(bool_entries); i++) { @@ -3479,7 +3479,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_CMD_APPLY_AUTO | SD_FLAG_ADVANCED + SD_FLAG_CMD_APPLY_AUTO ); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); #endif @@ -3513,7 +3513,7 @@ static bool setting_append_list( general_read_handler); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_VIDEO_SET_BLOCKING_STATE); menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); CONFIG_UINT( list, list_info, @@ -3527,7 +3527,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); if (string_is_equal(settings->video.driver, "gl")) { @@ -3559,7 +3559,6 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); } CONFIG_UINT( @@ -3574,7 +3573,6 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 15, 1, true, true); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); #if !defined(RARCH_MOBILE) CONFIG_BOOL( @@ -4431,7 +4429,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); END_SUB_GROUP(list, list_info, parent_group); @@ -4763,7 +4761,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); #ifdef RARCH_MOBILE @@ -5151,7 +5149,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE); + SD_FLAG_ADVANCED); if (string_is_equal(settings->menu.driver, "xmb")) { @@ -5182,7 +5180,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE); + SD_FLAG_ADVANCED); CONFIG_BOOL( list, list_info, @@ -5197,7 +5195,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE); + SD_FLAG_ADVANCED); END_SUB_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group); @@ -5394,7 +5392,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); CONFIG_UINT( @@ -5450,7 +5448,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); CONFIG_BOOL( From d40a0e2f3aee170191514ed4ff9e41fb8a6f354a Mon Sep 17 00:00:00 2001 From: Patrick Scheurenbrand Date: Sun, 11 Dec 2016 13:03:02 +0100 Subject: [PATCH 033/205] changed input binding order --- input/input_config.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/input/input_config.c b/input/input_config.c index 3e6481e006..c7bbc17430 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -76,30 +76,30 @@ static const char *bind_user_prefix[MAX_USERS] = { #define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind } const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { + DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A), DECLARE_BIND(b, RETRO_DEVICE_ID_JOYPAD_B, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B), + DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X), DECLARE_BIND(y, RETRO_DEVICE_ID_JOYPAD_Y, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y), DECLARE_BIND(select, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT), DECLARE_BIND(start, RETRO_DEVICE_ID_JOYPAD_START, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START), - DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP), - DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN), - DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT), - DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT), - DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A), - DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X), - DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L), + DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L), DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R), DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2), DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2), DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3), DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3), - DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS), - DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS), - DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS), + DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP), + DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN), + DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT), + DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT), DECLARE_BIND(l_y_minus, RARCH_ANALOG_LEFT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS), - DECLARE_BIND(r_x_plus, RARCH_ANALOG_RIGHT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS), - DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS), - DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS), + DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS), + DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS), + DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS), DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS), + DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS), + DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS), + DECLARE_BIND(r_x_plus, RARCH_ANALOG_RIGHT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS), DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE), From 5cf8391c5a281e6d6886aa240bfe2cba018fe042 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sun, 11 Dec 2016 15:52:32 +0100 Subject: [PATCH 034/205] replace the glsl snow shader with a more lightweight version. (gpu usage is approximately 25% compared to the original.) --- .../gl_shaders/pipeline_snow.glsl.frag.h | 118 +++++++++--------- menu/drivers_display/menu_display_gl.c | 7 ++ 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h index e9f47c4554..2f4d96f0ac 100644 --- a/gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h @@ -1,65 +1,69 @@ #include "shaders_common.h" -static const char *stock_fragment_xmb_snow = GLSL( - uniform float time; - vec2 res = vec2(1920*3, 1080*3); +static const char* stock_fragment_xmb_snow = GLSL( + uniform float time; + uniform vec2 OutputSize; - // High quality = larger patterns - // quality * 84 is the number of seconds in a loop - float quality = 8.0; + float baseScale = 3.5; // [1.0 .. 10.0] + float density = 0.7; // [0.01 .. 1.0] + float speed = 0.25; // [0.1 .. 1.0] - float Cellular2D(vec2 P) { - // https://github.com/BrianSharpe/Wombat/blob/master/Cellular2D.glsl - vec2 Pi = floor(P); - vec2 Pf = P - Pi; - vec4 Pt = vec4( Pi.xy, Pi.xy + 1.0 ); - Pt = Pt - floor(Pt * ( 1.0 / 71.0 )) * 71.0; - Pt += vec2( 26.0, 161.0 ).xyxy; - Pt *= Pt; - Pt = Pt.xzxz * Pt.yyww; - vec4 hash_x = fract( Pt * ( 1.0 / 951.135664 ) ); - vec4 hash_y = fract( Pt * ( 1.0 / 642.949883 ) ); - hash_x = hash_x * 2.0 - 1.0; - hash_y = hash_y * 2.0 - 1.0; - const float JITTER_WINDOW = 0.25; - hash_x = ( ( hash_x * hash_x * hash_x ) - sign( hash_x ) ) * JITTER_WINDOW + vec4( 0.0, 1.0, 0.0, 1.0 ); - hash_y = ( ( hash_y * hash_y * hash_y ) - sign( hash_y ) ) * JITTER_WINDOW + vec4( 0.0, 0.0, 1.0, 1.0 ); - vec4 dx = Pf.xxxx - hash_x; - vec4 dy = Pf.yyyy - hash_y; - vec4 d = dx * dx + dy * dy; - d.xy = min(d.xy, d.zw); - return min(d.x, d.y) * ( 1.0 / 1.125 ); - } + float rand(vec2 co) + { + return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453); + } - float snow(vec2 pos, float time, float scale) { - // add wobble - pos.x += cos(pos.y*4.0 + time*3.14159*2.0 + 1.0/scale)/(8.0/scale); - // add gravity - pos += time*scale*vec2(-0.5, 1.0); - return max( - 1.0 - Cellular2D(mod(pos/scale, scale*quality)*16.0)*1024.0, - 0.0 - ) * (scale*0.5 + 0.5); - } + float dist_func(vec2 distv) + { + float dist = sqrt((distv.x * distv.x) + (distv.y * distv.y)) * (40.0 / baseScale); + dist = clamp(dist, 0.0, 1.0); + return cos(dist * (3.14159265358 * 0.5)) * 0.5; + } - void main( void ) { - float winscale = max(res.x, res.y); - float tim = mod(time/8.0, 84.0*quality); - vec2 pos = gl_FragCoord.xy/winscale; - float a = 0.0; - // Each of these is a layer of snow - // Remove some for better performance - // Changing the scale (3rd value) will mess with the looping - a += snow(pos, tim, 1.0); - a += snow(pos, tim, 0.7); - a += snow(pos, tim, 0.6); - a += snow(pos, tim, 0.5); - a += snow(pos, tim, 0.4); - a += snow(pos, tim, 0.3); - a += snow(pos, tim, 0.25); - a += snow(pos, tim, 0.125); - a = a * min(pos.y*4.0, 1.0); - gl_FragColor = vec4(1.0, 1.0, 1.0, a); - } + float random_dots(vec2 co) + { + float part = 1.0 / 20.0; + vec2 cd = floor(co / part); + float p = rand(cd); + + if (p > 0.005 * (density * 40.0)) + return 0.0; + + vec2 dpos = (vec2(fract(p * 2.0) , p) + vec2(2.0, 2.0)) * 0.25; + + vec2 cellpos = fract(co / part); + vec2 distv = (cellpos - dpos); + + return dist_func(distv); + } + + float snow(vec2 pos, float time, float scale) + { + // add wobble + pos.x += cos(pos.y * 1.2 + time * 3.14159 * 2.0 + 1.0 / scale) / (8.0 / scale) * 4.0; + // add gravity + pos += time * scale * vec2(-0.5, 1.0) * 4.0; + return random_dots(pos / scale) * (scale * 0.5 + 0.5); + } + + void main(void) + { + float tim = time * 0.4 * speed; + vec2 pos = gl_FragCoord.xy / OutputSize.xx; + float a = 0.0; + // Each of these is a layer of snow + // Remove some for better performance + // Changing the scale (3rd value) will mess with the looping + a += snow(pos, tim, 1.0); + a += snow(pos, tim, 0.7); + a += snow(pos, tim, 0.6); + a += snow(pos, tim, 0.5); + a += snow(pos, tim, 0.4); + a += snow(pos, tim, 0.3); + a += snow(pos, tim, 0.25); + a += snow(pos, tim, 0.125); + a = a * min(pos.y * 4.0, 1.0); + gl_FragColor = vec4(1.0, 1.0, 1.0, a); + } ); diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index 6048a1085c..f1d056862d 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -193,6 +193,13 @@ static void menu_display_gl_draw_pipeline(void *data) uniform_param.lookup.ident = "time"; uniform_param.result.f.v0 = t; + video_shader_driver_set_parameter(uniform_param); + + uniform_param.type = UNIFORM_2F; + uniform_param.lookup.ident = "OutputSize"; + uniform_param.result.f.v0 = draw->width; + uniform_param.result.f.v1 = draw->height; + video_shader_driver_set_parameter(uniform_param); } break; From e0989d0b9efab81bb7e63a5e3a2940360de2e7a2 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 11 Dec 2016 12:30:20 -0500 Subject: [PATCH 035/205] make state screenshots non-gpu --- tasks/task_screenshot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index d80479cac2..70a5635db4 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -325,6 +325,9 @@ static bool take_screenshot_choice(const char *name_base, bool savestate) && string_is_empty(name_base)) return false; + if (savestate) + return take_screenshot_raw(name_base, NULL, savestate); + if (video_driver_supports_viewport_read()) { /* Avoid taking screenshot of GUI overlays. */ From 4964791cde5592a3ff8d6d0d4ff1f85effd3856f Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 11 Dec 2016 19:00:03 +0100 Subject: [PATCH 036/205] Revert "changed input binding order" --- input/input_config.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/input/input_config.c b/input/input_config.c index c7bbc17430..3e6481e006 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -76,30 +76,30 @@ static const char *bind_user_prefix[MAX_USERS] = { #define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind } const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { - DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A), DECLARE_BIND(b, RETRO_DEVICE_ID_JOYPAD_B, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B), - DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X), DECLARE_BIND(y, RETRO_DEVICE_ID_JOYPAD_Y, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y), DECLARE_BIND(select, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT), DECLARE_BIND(start, RETRO_DEVICE_ID_JOYPAD_START, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START), - DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L), + DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP), + DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN), + DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT), + DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT), + DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A), + DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X), + DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L), DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R), DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2), DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2), DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3), DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3), - DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP), - DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN), - DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT), - DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT), - DECLARE_BIND(l_y_minus, RARCH_ANALOG_LEFT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS), - DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS), - DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS), DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS), - DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS), - DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS), - DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS), + DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS), + DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS), + DECLARE_BIND(l_y_minus, RARCH_ANALOG_LEFT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS), DECLARE_BIND(r_x_plus, RARCH_ANALOG_RIGHT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS), + DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS), + DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS), + DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS), DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE), From 7c176c3d14ad1bbaca790a8bb629b9a14466c6b7 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Sun, 11 Dec 2016 12:59:32 -0500 Subject: [PATCH 037/205] replace simple snow with fancy snow code with different parameters --- .../pipeline_snow_simple.glsl.frag.h | 105 ++++++++++-------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h index 94687fe269..a72ad96299 100644 --- a/gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h @@ -1,52 +1,69 @@ #include "shaders_common.h" static const char *stock_fragment_xmb_simple_snow = GLSL( - uniform float time; - vec2 res = vec2(1920*3, 1080*3); - float quality = 8.0; + uniform float time; + uniform vec2 OutputSize; - float Cellular2D(vec2 P) { - vec2 Pi = floor(P); - vec2 Pf = P - Pi; - vec2 Pt = vec2( Pi.x, Pi.y + 1.0 ); - Pt = Pt - floor(Pt * ( 1.0 / 71.0 )) * 71.0; - Pt += vec2( 26.0, 161.0 ); - Pt *= Pt; - Pt = Pt.xy * Pt.yx; - float hash_x = fract( Pt.x * ( 1.0 / 951.135664 ) ) * 2.0 - 1.0; - float hash_y = fract( Pt.y * ( 1.0 / 642.949883 ) ) * 2.0 - 1.0; - const float JITTER_WINDOW = 0.25; - hash_x = ( ( hash_x * hash_x * hash_x ) - sign( hash_x ) ) * JITTER_WINDOW; - hash_y = ( ( hash_y * hash_y * hash_y ) - sign( hash_y ) ) * JITTER_WINDOW; - vec2 dd = vec2(Pf.x - hash_x, Pf.y - hash_y); - float d = dd.x * dd.x + dd.y * dd.y; - return d * ( 1.0 / 1.125 ); - } + float baseScale = 1.25; // [1.0 .. 10.0] + float density = 0.5; // [0.01 .. 1.0] + float speed = 0.15; // [0.1 .. 1.0] - float snow(vec2 pos, float time, float scale) { - pos.x += cos(pos.y*4.0 + time*3.14159*2.0 + 1.0/scale)/(8.0/scale); - pos += time*scale*vec2(-0.5, 1.0); - return max( - 1.0 - Cellular2D(mod(pos/scale, scale*quality)*16.0)*1024.0, - 0.0 - ) * (scale*0.5 + 0.5); - } + float rand(vec2 co) + { + return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453); + } - void main( void ) { - float winscale = max(res.x, res.y); - float tim = mod(time/8.0, 84.0*quality); - vec2 pos = gl_FragCoord.xy/winscale; - float a = 0.0; - a += snow(pos, tim, 1.0); - a += snow(pos, tim, 0.7); - a += snow(pos, tim, 0.6); - a += snow(pos, tim, 0.5); - a += snow(pos, tim, 0.4); - a += snow(pos, tim, 0.3); - a += snow(pos, tim, 0.25); - a += snow(pos, tim, 0.125); - a = a * min(pos.y*4.0, 1.0); - gl_FragColor = vec4(1.0, 1.0, 1.0, a); - } + float dist_func(vec2 distv) + { + float dist = sqrt((distv.x * distv.x) + (distv.y * distv.y)) * (40.0 / baseScale); + dist = clamp(dist, 0.0, 1.0); + return cos(dist * (3.14159265358 * 0.5)) * 0.5; + } + + float random_dots(vec2 co) + { + float part = 1.0 / 20.0; + vec2 cd = floor(co / part); + float p = rand(cd); + + if (p > 0.005 * (density * 40.0)) + return 0.0; + + vec2 dpos = (vec2(fract(p * 2.0) , p) + vec2(2.0, 2.0)) * 0.25; + + vec2 cellpos = fract(co / part); + vec2 distv = (cellpos - dpos); + + return dist_func(distv); + } + + float snow(vec2 pos, float time, float scale) + { + // add wobble + pos.x += cos(pos.y * 1.2 + time * 3.14159 * 2.0 + 1.0 / scale) / (8.0 / scale) * 4.0; + // add gravity + pos += time * scale * vec2(-0.5, 1.0) * 4.0; + return random_dots(pos / scale) * (scale * 0.5 + 0.5); + } + + void main(void) + { + float tim = time * 0.4 * speed; + vec2 pos = gl_FragCoord.xy / OutputSize.xx; + float a = 0.0; + // Each of these is a layer of snow + // Remove some for better performance + // Changing the scale (3rd value) will mess with the looping + a += snow(pos, tim, 1.0); + a += snow(pos, tim, 0.7); + a += snow(pos, tim, 0.6); + a += snow(pos, tim, 0.5); + a += snow(pos, tim, 0.4); + a += snow(pos, tim, 0.3); + a += snow(pos, tim, 0.25); + a += snow(pos, tim, 0.125); + a = a * min(pos.y * 4.0, 1.0); + gl_FragColor = vec4(1.0, 1.0, 1.0, a); + } ); From d82349a65f34bb100dd5ec8bc2472e4d01008077 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 20:54:07 +0100 Subject: [PATCH 038/205] Update 'Wallpaper' strings --- intl/msg_hash_de.h | 46 +++++++++++++++++++++++++++++++++++++++++----- intl/msg_hash_eo.h | 4 ++-- intl/msg_hash_fr.h | 2 +- intl/msg_hash_nl.h | 4 ++-- intl/msg_hash_ru.h | 4 ++-- intl/msg_hash_us.c | 6 +++--- intl/msg_hash_us.h | 8 ++++---- intl/msg_hash_vn.c | 10 +++++----- 8 files changed, 60 insertions(+), 24 deletions(-) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index a98a484606..3eb88bd851 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -308,12 +308,16 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, "Menü-Einstellungen") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Menühintergrund") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, + "Background opacity") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Fehlt") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, + "...") MSG_HASH(MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE, "Maus-Unterstützung") MSG_HASH(MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS, - "Media-Player-Einstellungen") /* UPDATE/FIXME */ + "Multimedia-Einstellungen") MSG_HASH(MENU_ENUM_LABEL_VALUE_MUSIC_TAB, "Musik") MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, @@ -322,26 +326,46 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND, "Navigation umbrechen") MSG_HASH(MENU_ENUM_LABEL_VALUE_NEAREST, "Nächster") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY, + "Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, /* TODO, Original string changed */ "Tausche Netplay-Eingabe") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Verzögere Netplay-Frames") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, + "Disconnect") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE, "Aktiviere Netplay") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT, + "Connect to Netplay host") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST, + "Start hosting") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS, /* TODO, Original string changed */ "IP-Addresse für Netplay") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS, + "Scan local network") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE, "Aktiviere Netplay-Client") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME, "Benutzername") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS, + "Netplay settings") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE, "Aktiviere Netplay-Zuschauermodus") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT, "TCP/UDP-Port für Netplay") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NAT_TRAVERSAL, + "Netplay NAT Traversal") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE, "Netzwerk-Befehle") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT, "Port für Netzwerk-Befehle") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION, + "Network Information") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE, + "Network Gamepad") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT, + "Network Remote Base Port") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, "Netzwerk-Einstellungen") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO, @@ -350,6 +374,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NONE, "Keins") MSG_HASH(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE, "Nicht verfügbar") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY, + "No achievements to display.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE, "Kein Core") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE, @@ -358,22 +384,32 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE, "Keine Core-Informationen verfügbar.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE, "Keine Core-Optionen verfügbar.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY, + "No entries to display.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE, + "No history available.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE, "Keine Informationen verfügbar.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ITEMS, "Keine Einträge.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND, + "No netplay hosts found.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND, + "No networks found.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, "Keine Leistungszähler.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS, + "No playlists.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE, "Keine Wiedergabelisten-Eintrage verfügbar.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND, "Keine Einstellungen gefunden.") MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS, "Keine Shaderparameter") -MSG_HASH(MENU_ENUM_LABEL_VALUE_OFF, /* Don't change. Needed for XMB atm. (Would be, "AN") */ - "OFF") -MSG_HASH(MENU_ENUM_LABEL_VALUE_ON, /* Don't change. Needed for XMB atm. (Would be, "AUS") */ - "ON") +MSG_HASH(MENU_ENUM_LABEL_VALUE_OFF, + "AN") +MSG_HASH(MENU_ENUM_LABEL_VALUE_ON, + "AUS") MSG_HASH(MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER, "Online-Aktualisierung") MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index d3044d7f78..8974034951 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -869,9 +869,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, "Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, - "Menu Wallpaper") + "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, - "Wallpaper opacity") + "Background opacity") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Missing") MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 7807aecb34..6b228b4da8 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -865,7 +865,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, "Fond d'écran") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, - "Wallpaper opacity") + "Background opacity") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Manquant") MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 70be6d4b9c..f823f482fc 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -869,9 +869,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, "Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, - "Menu Wallpaper") + "Achtergrond") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, - "Wallpaper opacity") + "Achtergrond doorzichtigheid") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Ontbrekend") MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 208e8cc13b..0ac4afd22c 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -869,9 +869,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, "Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, - "Menu Wallpaper") + "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, - "Wallpaper opacity") + "Background opacity") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Missing") MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index f5186a3783..76738fbb22 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1473,7 +1473,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Dynamic Wallpapers Directory. \n" " \n" - " The place to store wallpapers that will \n" + " The place to store backgrounds that will \n" "be loaded dynamically by the menu depending \n" "on context."); break; @@ -1525,7 +1525,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Enable touch input inside the menu."); break; case MENU_ENUM_LABEL_MENU_WALLPAPER: - snprintf(s, len, "Path to an image to set as menu wallpaper."); + snprintf(s, len, "Path to an image to set as the background."); break; case MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND: snprintf(s, len, @@ -1627,7 +1627,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER: snprintf(s, len, - "Dynamically load a new wallpaper \n" + "Dynamically load a new background \n" "depending on context."); break; case MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL: diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index b700be4636..5b972159ac 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -527,9 +527,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN, MSG_HASH(MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE, "Check for Missing Firmware Before Loading") MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, - "Dynamic Wallpaper") + "Dynamic Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY, - "Dynamic Wallpapers") + "Dynamic Backgrounds") MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE, "Enable Achievements") MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR, @@ -877,9 +877,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, "Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, - "Menu Wallpaper") + "Background") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY, - "Wallpaper opacity") + "Background opacity") MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING, "Missing") MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index acd4cb1696..62abe2e732 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -1527,7 +1527,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Enable touch input inside the menu."); break; case MENU_ENUM_LABEL_MENU_WALLPAPER: - snprintf(s, len, "Path to an image to set as menu wallpaper."); + snprintf(s, len, "Path to an image to set as the background."); break; case MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND: snprintf(s, len, @@ -2202,9 +2202,9 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) /* FIXME? Translate 'Load Dummy on Core Shutdown' */ return "Load Dummy on Core Shutdown"; case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER: - return "Dynamic Wallpaper"; + return "Dynamic Background"; case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY: - return "Dynamic Wallpapers Dir"; + return "Dynamic Background Dir"; case MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE: return "Enable"; case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR: @@ -2548,9 +2548,9 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_MENU_SETTINGS: return "Menu"; case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER: - return "Menu Wallpaper"; + return "Background"; case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY: - return "Wallpaper opacity"; + return "Background opacity"; case MENU_ENUM_LABEL_VALUE_MISSING: return "Missing"; case MENU_ENUM_LABEL_VALUE_MORE: From dde7a6157a50e246257ba35b4f69bfa8a2569d87 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Sun, 11 Dec 2016 17:55:31 -0200 Subject: [PATCH 039/205] README.md: Minor Markdown fixes --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 14d74eb630..07a4cee642 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,7 @@ To configure joypads, use the built-in menu or the `retroarch-joyconfig` command ## Compiling and installing **Linux** + - Prerequisites: ```bash sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev @@ -131,6 +132,7 @@ make ``` **Mac** + - Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download). - You can open the project (**pkg/apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**⌘-B**) and run (**⌘-R**) it there. Or you can use the command line... - Debug: @@ -149,6 +151,7 @@ open ./pkg/apple/build/Release/RetroArch.app/ ``` **PC** + Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki). **PlayStation 3** From 4fed31fa262863e0f97e58bc2886a00322cb0e56 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Sun, 11 Dec 2016 18:30:01 -0200 Subject: [PATCH 040/205] Fix typos --- qb/config.params.sh | 2 +- ui/drivers/qt/wimp/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qb/config.params.sh b/qb/config.params.sh index 95ac98fb2a..fde0c1af31 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -81,7 +81,7 @@ HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support HAVE_PARPORT=auto # Parallel port joypad support HAVE_IMAGEVIEWER=yes # Built-in image viewer support. HAVE_MMAP=auto # MMAP support -HAVE_QT=no # QT companion support +HAVE_QT=no # Qt companion support HAVE_QT_WRAPPER=no HAVE_XSHM=no # XShm video driver support HAVE_CHEEVOS=yes # Retro Achievements diff --git a/ui/drivers/qt/wimp/main.qml b/ui/drivers/qt/wimp/main.qml index 5cb25d91d1..d917ed83ff 100644 --- a/ui/drivers/qt/wimp/main.qml +++ b/ui/drivers/qt/wimp/main.qml @@ -30,7 +30,7 @@ ApplicationWindow { initialPage: Page { id: page - title: "QT!" + title: "Qt!" tabs: navDrawer.enabled ? [] : sectionTitles From c0caae124ebedb555398f578dd50fc5baa718329 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 22:11:03 +0100 Subject: [PATCH 041/205] Prevent warning --- .../gl_renderchains/render_chain_gl_legacy.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c index 6010b9895a..8bb1bd8da7 100644 --- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c +++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c @@ -232,14 +232,16 @@ void gl_check_fbo_dimensions(gl_t *gl) /* Check if we have to recreate our FBO textures. */ for (i = 0; i < gl->fbo_pass; i++) { - bool update_feedback = gl->fbo_feedback_enable - && (unsigned)i == gl->fbo_feedback_pass; struct video_fbo_rect *fbo_rect = &gl->fbo_rect[i]; - bool check_dimensions = - (fbo_rect->max_img_width > fbo_rect->width) || - (fbo_rect->max_img_height > fbo_rect->height); - if (fbo_rect && check_dimensions) - gl_check_fbo_dimension(gl, i, update_feedback); + if (fbo_rect) + { + bool update_feedback = gl->fbo_feedback_enable + && (unsigned)i == gl->fbo_feedback_pass; + + if ((fbo_rect->max_img_width > fbo_rect->width) || + (fbo_rect->max_img_height > fbo_rect->height)) + gl_check_fbo_dimension(gl, i, update_feedback); + } } } void gl_renderchain_render(gl_t *gl, From 5eac050fe5ec3b986f6cb511171aa6ce818e6af3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 22:18:58 +0100 Subject: [PATCH 042/205] Hide advanced settings --- menu/menu_displaylist.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1fc78c7600..d5eedc22c6 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4629,9 +4629,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL, PARSE_ONLY_UINT, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_PERFCNT_ENABLE, - PARSE_ONLY_BOOL, false); + if (settings->menu.show_advanced_settings) + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_PERFCNT_ENABLE, + PARSE_ONLY_BOOL, false); info->need_refresh = true; info->need_push = true; @@ -4645,9 +4646,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SLOWMOTION_RATIO, PARSE_ONLY_FLOAT, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE, - PARSE_ONLY_BOOL, false); + if (settings->menu.show_advanced_settings) + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE, + PARSE_ONLY_BOOL, false); info->need_refresh = true; info->need_push = true; From bcfbf46e5aa1246b9a335949b0ef2fbcd0abdada Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 22:39:26 +0100 Subject: [PATCH 043/205] Comment out underrun log messages for PulseAudio --- audio/drivers/pulse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/audio/drivers/pulse.c b/audio/drivers/pulse.c index dee3c5c108..83aacafa86 100644 --- a/audio/drivers/pulse.c +++ b/audio/drivers/pulse.c @@ -125,6 +125,7 @@ static void stream_latency_update_cb(pa_stream *s, void *data) static void underrun_update_cb(pa_stream *s, void *data) { +#if 0 pa_t *pa = (pa_t*)data; (void)s; @@ -132,6 +133,7 @@ static void underrun_update_cb(pa_stream *s, void *data) RARCH_LOG("[PulseAudio]: Underrun (Buffer: %u, Writable size: %u).\n", (unsigned)pa->buffer_size, (unsigned)pa_stream_writable_size(pa->stream)); +#endif } static void buffer_attr_cb(pa_stream *s, void *data) @@ -141,7 +143,9 @@ static void buffer_attr_cb(pa_stream *s, void *data) if (server_attr) pa->buffer_size = server_attr->tlength; +#if 0 RARCH_LOG("[PulseAudio]: Got new buffer size %u.\n", (unsigned)pa->buffer_size); +#endif } static void *pulse_init(const char *device, unsigned rate, unsigned latency) From 48e60d075c4014b94e83b85a0d17076cbe93f377 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Dec 2016 23:00:26 +0100 Subject: [PATCH 044/205] playlist_free_entry - use string_is_empty --- playlist.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playlist.c b/playlist.c index 530296a7da..0d2f2587e6 100644 --- a/playlist.c +++ b/playlist.c @@ -150,22 +150,22 @@ static void playlist_free_entry(struct playlist_entry *entry) if (!entry) return; - if (entry->path) + if (!string_is_empty(entry->path)) free(entry->path); - if (entry->label) + if (!string_is_empty(entry->label)) free(entry->label); - if (entry->core_path) + if (!string_is_empty(entry->core_path)) free(entry->core_path); - if (entry->core_name) + if (!string_is_empty(entry->core_name)) free(entry->core_name); - if (entry->db_name) + if (!string_is_empty(entry->db_name)) free(entry->db_name); - if (entry->crc32) + if (!string_is_empty(entry->crc32)) free(entry->crc32); entry->path = NULL; From be89a28b2cd5f39304e1676e9a338e0df09a6b03 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 01:46:44 +0100 Subject: [PATCH 045/205] (menu_setting.c) Hide some settings for default mode --- menu/menu_setting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 39f4b32456..8fc0ae2939 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4078,7 +4078,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); CONFIG_BOOL( @@ -4094,7 +4094,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler, - SD_FLAG_NONE + SD_FLAG_ADVANCED ); #if 0 From 278cd25c763f6a6db99c74135b1a622d1f959422 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 01:51:13 +0100 Subject: [PATCH 046/205] Hide 'Updater Settings' for non-advanced mode --- menu/menu_setting.c | 1 + 1 file changed, 1 insertion(+) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 8fc0ae2939..90082d721e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2540,6 +2540,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); if (!string_is_equal(settings->wifi.driver, "null")) { From 90c463b779b131afc191d2d99d05ddd189a0d3c5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:18:48 +0100 Subject: [PATCH 047/205] (XMB) Add logging --- menu/drivers/xmb.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index e9305ab51c..5b9d06aac7 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2755,7 +2755,7 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width) new_font_size = 32.0 * scale_factor; xmb->font2_size = 24.0 * scale_factor; new_header_height = 128.0 * scale_factor; - xmb->margins.screen.top = (256+32) * scale_factor; + xmb->thumbnail_width = 460.0 * scale_factor; xmb->savestate_thumbnail_width= 460.0 * scale_factor; @@ -2764,16 +2764,34 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width) xmb->icon.spacing.horizontal = 200.0 * scale_factor; xmb->icon.spacing.vertical = 64.0 * scale_factor; + xmb->margins.screen.top = (256+32) * scale_factor; xmb->margins.screen.left = 336.0 * scale_factor; + xmb->margins.title.left = 60 * scale_factor; xmb->margins.title.top = 60 * scale_factor + new_font_size / 3; xmb->margins.title.bottom = 60 * scale_factor - new_font_size / 3; + xmb->margins.label.left = 85.0 * scale_factor; xmb->margins.label.top = new_font_size / 3.0; + xmb->margins.setting.left = 600.0 * scale_factor; + xmb->icon.size = 128.0 * scale_factor; xmb->font_size = new_font_size; +#if 0 + RARCH_LOG("[XMB] margin screen left: %.2f\n", xmb->margins.screen.left); + RARCH_LOG("[XMB] margin screen top: %.2f\n", xmb->margins.screen.top); + RARCH_LOG("[XMB] margin title left: %.2f\n", xmb->margins.title.left); + RARCH_LOG("[XMB] margin title top: %.2f\n", xmb->margins.title.top); + RARCH_LOG("[XMB] margin title bott: %.2f\n", xmb->margins.title.bottom); + RARCH_LOG("[XMB] margin label left: %.2f\n", xmb->margins.label.left); + RARCH_LOG("[XMB] margin label top: %.2f\n", xmb->margins.label.top); + RARCH_LOG("[XMB] margin sett left: %.2f\n", xmb->margins.setting.left); + RARCH_LOG("[XMB] icon spacing hor: %.2f\n", xmb->icon.spacing.horizontal); + RARCH_LOG("[XMB] icon spacing ver: %.2f\n", xmb->icon.spacing.vertical); +#endif + menu_display_set_header_height(new_header_height); } @@ -2827,6 +2845,19 @@ static void xmb_layout_psp(xmb_handle_t *xmb, int width) xmb->icon.size = 128.0 * scale_factor; xmb->font_size = new_font_size; +#if 0 + RARCH_LOG("[XMB] margin screen left: %.2f\n", xmb->margins.screen.left); + RARCH_LOG("[XMB] margin screen top: %.2f\n", xmb->margins.screen.top); + RARCH_LOG("[XMB] margin title left: %.2f\n", xmb->margins.title.left); + RARCH_LOG("[XMB] margin title top: %.2f\n", xmb->margins.title.top); + RARCH_LOG("[XMB] margin title bott: %.2f\n", xmb->margins.title.bottom); + RARCH_LOG("[XMB] margin label left: %.2f\n", xmb->margins.label.left); + RARCH_LOG("[XMB] margin label top: %.2f\n", xmb->margins.label.top); + RARCH_LOG("[XMB] margin sett left: %.2f\n", xmb->margins.setting.left); + RARCH_LOG("[XMB] icon spacing hor: %.2f\n", xmb->icon.spacing.horizontal); + RARCH_LOG("[XMB] icon spacing ver: %.2f\n", xmb->icon.spacing.vertical); +#endif + menu_display_set_header_height(new_header_height); } From a4dde93a2f62210046d20d5d087f4e4fd915cac5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:20:00 +0100 Subject: [PATCH 048/205] Add XMB_DEBUG --- menu/drivers/xmb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 5b9d06aac7..2eb2c8589f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -68,6 +68,10 @@ #define XMB_DELAY 10 #endif +#if 0 +#define XMB_DEBUG +#endif + typedef struct { float alpha; @@ -2779,7 +2783,7 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width) xmb->icon.size = 128.0 * scale_factor; xmb->font_size = new_font_size; -#if 0 +#ifdef XMB_DEBUG RARCH_LOG("[XMB] margin screen left: %.2f\n", xmb->margins.screen.left); RARCH_LOG("[XMB] margin screen top: %.2f\n", xmb->margins.screen.top); RARCH_LOG("[XMB] margin title left: %.2f\n", xmb->margins.title.left); @@ -2845,7 +2849,7 @@ static void xmb_layout_psp(xmb_handle_t *xmb, int width) xmb->icon.size = 128.0 * scale_factor; xmb->font_size = new_font_size; -#if 0 +#ifdef XMB_DEBUG RARCH_LOG("[XMB] margin screen left: %.2f\n", xmb->margins.screen.left); RARCH_LOG("[XMB] margin screen top: %.2f\n", xmb->margins.screen.top); RARCH_LOG("[XMB] margin title left: %.2f\n", xmb->margins.title.left); From dd3371507463c38831011167d8bcec6f7fa69f63 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:24:31 +0100 Subject: [PATCH 049/205] (XMB) Cleanups --- menu/drivers/xmb.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 2eb2c8589f..54c83d33b0 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -68,7 +68,7 @@ #define XMB_DELAY 10 #endif -#if 0 +#if 1 #define XMB_DEBUG #endif @@ -938,7 +938,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i) menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist); - if (settings->savestate_thumbnail_enable + if ( (settings->savestate_thumbnail_enable) && (string_is_equal(entry.label, "state_slot") || string_is_equal(entry.label, "loadstate") || string_is_equal(entry.label, "savestate"))) @@ -2734,18 +2734,17 @@ static void xmb_frame(void *data) static void xmb_layout_ps3(xmb_handle_t *xmb, int width) { unsigned new_font_size, new_header_height; - float scale_factor; - settings_t *settings = config_get_ptr(); + settings_t *settings = config_get_ptr(); - scale_factor = (settings->menu.xmb.scale_factor * width) / (1920.0 * 100); + float scale_factor = (settings->menu.xmb.scale_factor * width) / (1920.0 * 100); - xmb->above_subitem_offset = 1.5; - xmb->above_item_offset = -1.0; - xmb->active_item_factor = 3.0; - xmb->under_item_offset = 5.0; + xmb->above_subitem_offset = 1.5; + xmb->above_item_offset = -1.0; + xmb->active_item_factor = 3.0; + xmb->under_item_offset = 5.0; - xmb->categories.active.zoom = 1.0; - xmb->categories.passive.zoom = 0.5; + xmb->categories.active.zoom = 1.0; + xmb->categories.passive.zoom = 0.5; xmb->items.active.zoom = 1.0; xmb->items.passive.zoom = 0.5; @@ -2802,10 +2801,9 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width) static void xmb_layout_psp(xmb_handle_t *xmb, int width) { unsigned new_font_size, new_header_height; - float scale_factor; - settings_t *settings = config_get_ptr(); + settings_t *settings = config_get_ptr(); + float scale_factor = ((settings->menu.xmb.scale_factor * width) / (1920.0 * 100)) * 1.5; - scale_factor = ((settings->menu.xmb.scale_factor * width) / (1920.0 * 100)) * 1.5; #ifdef _3DS scale_factor = settings->menu.xmb.scale_factor / 400.0; #endif From b9984387f5ffd35c26f23ae8a58b1f4b8929c32e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:28:55 +0100 Subject: [PATCH 050/205] (XMB) Add another log --- menu/drivers/xmb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 54c83d33b0..6239892000 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -68,7 +68,7 @@ #define XMB_DELAY 10 #endif -#if 1 +#if 0 #define XMB_DEBUG #endif @@ -2793,6 +2793,7 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width) RARCH_LOG("[XMB] margin sett left: %.2f\n", xmb->margins.setting.left); RARCH_LOG("[XMB] icon spacing hor: %.2f\n", xmb->icon.spacing.horizontal); RARCH_LOG("[XMB] icon spacing ver: %.2f\n", xmb->icon.spacing.vertical); + RARCH_LOG("[XMB] icon size: %.2f\n", xmb->icon.size); #endif menu_display_set_header_height(new_header_height); @@ -2858,6 +2859,7 @@ static void xmb_layout_psp(xmb_handle_t *xmb, int width) RARCH_LOG("[XMB] margin sett left: %.2f\n", xmb->margins.setting.left); RARCH_LOG("[XMB] icon spacing hor: %.2f\n", xmb->icon.spacing.horizontal); RARCH_LOG("[XMB] icon spacing ver: %.2f\n", xmb->icon.spacing.vertical); + RARCH_LOG("[XMB] icon size: %.2f\n", xmb->icon.size); #endif menu_display_set_header_height(new_header_height); From 3e25dfb2201af8e279fa81f3a88b845c6d732d67 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:34:21 +0100 Subject: [PATCH 051/205] (XMB) Add log --- menu/drivers/xmb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 6239892000..9208f76755 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2553,9 +2553,16 @@ static void xmb_frame(void *data) xmb->savestate_thumbnail); else if (xmb->thumbnail && !string_is_equal(xmb_thumbnails_ident(), "OFF")) + { +#ifdef XMB_DEBUG + RARCH_LOG("[XMB thumbnail] width: %.2f, height: %.2f\n", xmb->thumbnail_width, xmb->thumbnail_height); + RARCH_LOG("[XMB thumbnail] w: %.2f, h: %.2f\n", width, height); +#endif + xmb_draw_thumbnail(xmb, &coord_white[0], width, height, xmb->thumbnail_width, xmb->thumbnail_height, xmb->thumbnail); + } /* Clock image */ menu_display_set_alpha(coord_white, MIN(xmb->alpha, 1.00f)); From 5fa01c94d3212c8a64dcf8de2483a66db6cd620f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 03:57:56 +0100 Subject: [PATCH 052/205] (XMB) Put thumbnail on foreground --- menu/drivers/xmb.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9208f76755..75779ca2aa 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2547,22 +2547,6 @@ static void xmb_frame(void *data) menu_display_rotate_z(&rotate_draw); menu_display_blend_begin(); - if (xmb->savestate_thumbnail) - xmb_draw_thumbnail(xmb, &coord_white[0], width, height, - xmb->savestate_thumbnail_width, xmb->savestate_thumbnail_height, - xmb->savestate_thumbnail); - else if (xmb->thumbnail - && !string_is_equal(xmb_thumbnails_ident(), "OFF")) - { -#ifdef XMB_DEBUG - RARCH_LOG("[XMB thumbnail] width: %.2f, height: %.2f\n", xmb->thumbnail_width, xmb->thumbnail_height); - RARCH_LOG("[XMB thumbnail] w: %.2f, h: %.2f\n", width, height); -#endif - - xmb_draw_thumbnail(xmb, &coord_white[0], width, height, - xmb->thumbnail_width, xmb->thumbnail_height, - xmb->thumbnail); - } /* Clock image */ menu_display_set_alpha(coord_white, MIN(xmb->alpha, 1.00f)); @@ -2735,6 +2719,23 @@ static void xmb_frame(void *data) width, height); + if (xmb->savestate_thumbnail) + xmb_draw_thumbnail(xmb, &coord_white[0], width, height, + xmb->savestate_thumbnail_width, xmb->savestate_thumbnail_height, + xmb->savestate_thumbnail); + else if (xmb->thumbnail + && !string_is_equal(xmb_thumbnails_ident(), "OFF")) + { +#ifdef XMB_DEBUG + RARCH_LOG("[XMB thumbnail] width: %.2f, height: %.2f\n", xmb->thumbnail_width, xmb->thumbnail_height); + RARCH_LOG("[XMB thumbnail] w: %.2f, h: %.2f\n", width, height); +#endif + + xmb_draw_thumbnail(xmb, &coord_white[0], width, height, + xmb->thumbnail_width, xmb->thumbnail_height, + xmb->thumbnail); + } + menu_display_unset_viewport(); } From 18392a5e4094b118271b4795158b7712a858f4d4 Mon Sep 17 00:00:00 2001 From: Arzed Five Date: Mon, 12 Dec 2016 03:46:26 +0000 Subject: [PATCH 053/205] (XMB VK snow) Attempt to fix the Vulkan snow menu shader --- .../vulkan_shaders/pipeline_snow_simple.frag | 72 +++++++++++++++++-- .../vulkan_shaders/pipeline_snow_simple.vert | 65 ++--------------- 2 files changed, 75 insertions(+), 62 deletions(-) diff --git a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag index d55983b42c..1dcc659225 100644 --- a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag +++ b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag @@ -1,13 +1,77 @@ #version 310 es - -layout(location = 0) in vec3 VertexCoord; +precision highp float; layout(std140, set = 0, binding = 0) uniform UBO { + vec4 OutputSize; float time; -} constants; +} global; + +layout(location = 0) in vec2 vTexCoord; +layout(location = 0) out vec4 FragColor; + +float baseScale = 1.25; // [1.0 .. 10.0] +float density = 0.5; // [0.01 .. 1.0] +float speed = 0.15; // [0.1 .. 1.0] + +float rand(vec2 co) +{ + return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453); +} + +float dist_func(vec2 distv) +{ + float dist = sqrt((distv.x * distv.x) + (distv.y * distv.y)) * (40.0 / baseScale); + dist = clamp(dist, 0.0, 1.0); + return cos(dist * (3.14159265358 * 0.5)) * 0.5; +} + +float random_dots(vec2 co) +{ + float part = 1.0 / 20.0; + vec2 cd = floor(co / vec2(part)); + float p = rand(cd); + + if (p > 0.005 * (density * 40.0)) + return 0.0; + + vec2 dpos = (vec2(fract(p * 2.0) , p) + vec2(2.0, 2.0)) * 0.25; + + vec2 cellpos = fract(co / part); + vec2 distv = (cellpos - dpos); + + return dist_func(distv); +} + +float snow(vec2 pos, float time, float scale) +{ + // add wobble + pos.x += cos(pos.y * 1.2 + time * 3.14159 * 2.0 + 1.0 / scale) / (8.0 / scale) * 4.0; + + // add gravity + pos += time * scale * vec2(-0.5, 1.0) * 4.0; + + return random_dots(pos / vec2(scale)) * (scale * 0.5 + 0.5); +} void main() { - gl_Position = MVPMatrix * vec4(VertexCoord, 0.0, 1.0); + float tim = global.time * 0.4 * speed; + vec2 pos = vTexCoord.xy / global.OutputSize.xx; + float a = 0.0; + + // Each of these is a layer of snow + // Remove some for better performance + // Changing the scale (3rd value) will mess with the looping + a += snow(pos, tim, 1.0); + a += snow(pos, tim, 0.7); + a += snow(pos, tim, 0.6); + a += snow(pos, tim, 0.5); + a += snow(pos, tim, 0.4); + a += snow(pos, tim, 0.3); + a += snow(pos, tim, 0.25); + a += snow(pos, tim, 0.125); + a = a * min(pos.y * 4.0, 1.0); + + FragColor = vec4(1.0, 1.0, 1.0, a); } diff --git a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert index a850e7aee9..0f6f87681e 100644 --- a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert +++ b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert @@ -1,66 +1,15 @@ #version 310 es -precision highp float; +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; layout(std140, set = 0, binding = 0) uniform UBO { - float time; -} constants; - -layout(location = 0) out vec4 FragColor; - - vec2 res = vec2(1920*3, 1080*3); - - // High quality = larger patterns - // quality * 84 is the number of seconds in a loop - float quality = 8.0; - - float Cellular2D(vec2 P) { - // https://github.com/BrianSharpe/Wombat/blob/master/Cellular2D.glsl - vec2 Pi = floor(P); - vec2 Pf = P - Pi; - vec2 Pt = vec2( Pi.x, Pi.y + 1.0 ); - Pt = Pt - floor(Pt * ( 1.0 / 71.0 )) * 71.0; - Pt += vec2( 26.0, 161.0 ).xy; - Pt *= Pt; - Pt = Pt.xy * Pt.yx; - float hash_x = fract( Pt * ( 1.0 / 951.135664 ) ).x * 2.0 - 1.0; - float hash_y = fract( Pt * ( 1.0 / 642.949883 ) ).y * 2.0 - 1.0; - const float JITTER_WINDOW = 0.25; - hash_x = ( ( hash_x * hash_x * hash_x ) - sign( hash_x ) ) * JITTER_WINDOW; - hash_y = ( ( hash_y * hash_y * hash_y ) - sign( hash_y ) ) * JITTER_WINDOW; - vec2 dd = vec2(Pf.x - hash_x, Pf.y - hash_y); - float d = dd.x * dd.x + dd.y * dd.y; - return d * ( 1.0 / 1.125 ); - } - - float snow(vec2 pos, float time, float scale) { - // add wobble - pos.x += cos(pos.y*4.0 + time*3.14159*2.0 + 1.0/scale)/(8.0/scale); - // add gravity - pos += time*scale*vec2(-0.5, 1.0); - return max( - 1.0 - Cellular2D(mod(pos/scale, scale*quality)*16.0)*1024.0, - 0.0 - ) * (scale*0.5 + 0.5); - } + mat4 MVP; +} global; void main() { - float winscale = max(res.x, res.y); - float tim = mod(constants.time/800.0, 84.0*quality); - vec2 pos = gl_FragCoord.xy/winscale; - float a = 0.0; - // Each of these is a layer of snow - // Remove some for better performance - // Changing the scale (3rd value) will mess with the looping - a += snow(pos, tim, 1.0); - a += snow(pos, tim, 0.7); - a += snow(pos, tim, 0.6); - a += snow(pos, tim, 0.5); - a += snow(pos, tim, 0.4); - a += snow(pos, tim, 0.3); - a += snow(pos, tim, 0.25); - a += snow(pos, tim, 0.125); - a = a * min(pos.y*4.0, 1.0); - FragColor = vec4(1.0, 1.0, 1.0, a); + gl_Position = global.MVP * vec4(TexCoord, 0.0, 1.0); + vTexCoord = TexCoord; } From a94b15ac86cba70027604e2ee19c78ac144af04b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 05:21:38 +0100 Subject: [PATCH 054/205] (Vulkan) Add pipeline snow simple shader --- .../pipeline_snow_simple.frag.inc | 408 ++++++++++++++++++ .../pipeline_snow_simple.vert.inc | 75 ++++ 2 files changed, 483 insertions(+) create mode 100644 gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag.inc create mode 100644 gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert.inc diff --git a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag.inc b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag.inc new file mode 100644 index 0000000000..d503fdf156 --- /dev/null +++ b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.frag.inc @@ -0,0 +1,408 @@ +{0x07230203,0x00010000,0x00080001,0x0000010e, +0x00000000,0x00020011,0x00000001,0x0006000b, +0x00000001,0x4c534c47,0x6474732e,0x3035342e, +0x00000000,0x0003000e,0x00000000,0x00000001, +0x0007000f,0x00000004,0x00000004,0x6e69616d, +0x00000000,0x000000b7,0x0000010b,0x00030010, +0x00000004,0x00000007,0x00030003,0x00000001, +0x00000136,0x000a0004,0x475f4c47,0x4c474f4f, +0x70635f45,0x74735f70,0x5f656c79,0x656e696c, +0x7269645f,0x69746365,0x00006576,0x00080004, +0x475f4c47,0x4c474f4f,0x6e695f45,0x64756c63, +0x69645f65,0x74636572,0x00657669,0x00040005, +0x00000004,0x6e69616d,0x00000000,0x00050005, +0x0000000b,0x646e6172,0x32667628,0x0000003b, +0x00030005,0x0000000a,0x00006f63,0x00060005, +0x0000000e,0x74736964,0x6e75665f,0x66762863, +0x00003b32,0x00040005,0x0000000d,0x74736964, +0x00000076,0x00070005,0x00000011,0x646e6172, +0x645f6d6f,0x2873746f,0x3b326676,0x00000000, +0x00030005,0x00000010,0x00006f63,0x00060005, +0x00000018,0x776f6e73,0x32667628,0x3b31663b, +0x003b3166,0x00030005,0x00000015,0x00736f70, +0x00040005,0x00000016,0x656d6974,0x00000000, +0x00040005,0x00000017,0x6c616373,0x00000065, +0x00050005,0x0000001b,0x65736162,0x6c616353, +0x00000065,0x00040005,0x0000001d,0x736e6564, +0x00797469,0x00040005,0x0000001f,0x65657073, +0x00000064,0x00040005,0x0000002c,0x74736964, +0x00000000,0x00040005,0x0000004b,0x74726170, +0x00000000,0x00030005,0x0000004d,0x00006463, +0x00030005,0x00000053,0x00000070,0x00040005, +0x00000054,0x61726170,0x0000006d,0x00040005, +0x00000061,0x736f7064,0x00000000,0x00040005, +0x0000006c,0x6c6c6563,0x00736f70,0x00040005, +0x00000072,0x74736964,0x00000076,0x00040005, +0x00000076,0x61726170,0x0000006d,0x00040005, +0x0000009f,0x61726170,0x0000006d,0x00030005, +0x000000a7,0x006d6974,0x00030005,0x000000a9, +0x004f4255,0x00060006,0x000000a9,0x00000000, +0x7074754f,0x69537475,0x0000657a,0x00050006, +0x000000a9,0x00000001,0x656d6974,0x00000000, +0x00040005,0x000000ab,0x626f6c67,0x00006c61, +0x00030005,0x000000b5,0x00736f70,0x00050005, +0x000000b7,0x78655476,0x726f6f43,0x00000064, +0x00030005,0x000000bf,0x00000061,0x00040005, +0x000000c0,0x61726170,0x0000006d,0x00040005, +0x000000c2,0x61726170,0x0000006d,0x00040005, +0x000000c4,0x61726170,0x0000006d,0x00040005, +0x000000c9,0x61726170,0x0000006d,0x00040005, +0x000000cb,0x61726170,0x0000006d,0x00040005, +0x000000cd,0x61726170,0x0000006d,0x00040005, +0x000000d2,0x61726170,0x0000006d,0x00040005, +0x000000d4,0x61726170,0x0000006d,0x00040005, +0x000000d6,0x61726170,0x0000006d,0x00040005, +0x000000da,0x61726170,0x0000006d,0x00040005, +0x000000dc,0x61726170,0x0000006d,0x00040005, +0x000000de,0x61726170,0x0000006d,0x00040005, +0x000000e2,0x61726170,0x0000006d,0x00040005, +0x000000e4,0x61726170,0x0000006d,0x00040005, +0x000000e6,0x61726170,0x0000006d,0x00040005, +0x000000eb,0x61726170,0x0000006d,0x00040005, +0x000000ed,0x61726170,0x0000006d,0x00040005, +0x000000ef,0x61726170,0x0000006d,0x00040005, +0x000000f3,0x61726170,0x0000006d,0x00040005, +0x000000f5,0x61726170,0x0000006d,0x00040005, +0x000000f7,0x61726170,0x0000006d,0x00040005, +0x000000fc,0x61726170,0x0000006d,0x00040005, +0x000000fe,0x61726170,0x0000006d,0x00040005, +0x00000100,0x61726170,0x0000006d,0x00050005, +0x0000010b,0x67617246,0x6f6c6f43,0x00000072, +0x00050048,0x000000a9,0x00000000,0x00000023, +0x00000000,0x00050048,0x000000a9,0x00000001, +0x00000023,0x00000010,0x00030047,0x000000a9, +0x00000002,0x00040047,0x000000ab,0x00000022, +0x00000000,0x00040047,0x000000ab,0x00000021, +0x00000000,0x00040047,0x000000b7,0x0000001e, +0x00000000,0x00040047,0x0000010b,0x0000001e, +0x00000000,0x00020013,0x00000002,0x00030021, +0x00000003,0x00000002,0x00030016,0x00000006, +0x00000020,0x00040017,0x00000007,0x00000006, +0x00000002,0x00040020,0x00000008,0x00000007, +0x00000007,0x00040021,0x00000009,0x00000006, +0x00000008,0x00040020,0x00000013,0x00000007, +0x00000006,0x00060021,0x00000014,0x00000006, +0x00000008,0x00000013,0x00000013,0x00040020, +0x0000001a,0x00000006,0x00000006,0x0004003b, +0x0000001a,0x0000001b,0x00000006,0x0004002b, +0x00000006,0x0000001c,0x3fa00000,0x0004003b, +0x0000001a,0x0000001d,0x00000006,0x0004002b, +0x00000006,0x0000001e,0x3f000000,0x0004003b, +0x0000001a,0x0000001f,0x00000006,0x0004002b, +0x00000006,0x00000020,0x3e19999a,0x0004002b, +0x00000006,0x00000022,0x414fd639,0x0004002b, +0x00000006,0x00000023,0x429c774c,0x0005002c, +0x00000007,0x00000024,0x00000022,0x00000023, +0x0004002b,0x00000006,0x00000027,0x472aee8c, +0x00040015,0x0000002d,0x00000020,0x00000000, +0x0004002b,0x0000002d,0x0000002e,0x00000000, +0x0004002b,0x0000002d,0x00000034,0x00000001, +0x0004002b,0x00000006,0x0000003c,0x42200000, +0x0004002b,0x00000006,0x00000041,0x00000000, +0x0004002b,0x00000006,0x00000042,0x3f800000, +0x0004002b,0x00000006,0x00000045,0x3fc90fdb, +0x0004002b,0x00000006,0x0000004c,0x3d4ccccd, +0x0004002b,0x00000006,0x00000058,0x3ba3d70a, +0x00020014,0x0000005c,0x0004002b,0x00000006, +0x00000063,0x40000000,0x0005002c,0x00000007, +0x00000068,0x00000063,0x00000063,0x0004002b, +0x00000006,0x0000006a,0x3e800000,0x0004002b, +0x00000006,0x0000007d,0x3f99999a,0x0004002b, +0x00000006,0x00000080,0x40490fd0,0x0004002b, +0x00000006,0x00000088,0x41000000,0x0004002b, +0x00000006,0x0000008c,0x40800000,0x0004002b, +0x00000006,0x00000095,0xbf000000,0x0005002c, +0x00000007,0x00000096,0x00000095,0x00000042, +0x00040017,0x000000a8,0x00000006,0x00000004, +0x0004001e,0x000000a9,0x000000a8,0x00000006, +0x00040020,0x000000aa,0x00000002,0x000000a9, +0x0004003b,0x000000aa,0x000000ab,0x00000002, +0x00040015,0x000000ac,0x00000020,0x00000001, +0x0004002b,0x000000ac,0x000000ad,0x00000001, +0x00040020,0x000000ae,0x00000002,0x00000006, +0x0004002b,0x00000006,0x000000b1,0x3ecccccd, +0x00040020,0x000000b6,0x00000001,0x00000007, +0x0004003b,0x000000b6,0x000000b7,0x00000001, +0x0004002b,0x000000ac,0x000000b9,0x00000000, +0x00040020,0x000000ba,0x00000002,0x000000a8, +0x0004002b,0x00000006,0x000000c8,0x3f333333, +0x0004002b,0x00000006,0x000000d1,0x3f19999a, +0x0004002b,0x00000006,0x000000ea,0x3e99999a, +0x0004002b,0x00000006,0x000000fb,0x3e000000, +0x00040020,0x0000010a,0x00000003,0x000000a8, +0x0004003b,0x0000010a,0x0000010b,0x00000003, +0x00050036,0x00000002,0x00000004,0x00000000, +0x00000003,0x000200f8,0x00000005,0x0004003b, +0x00000013,0x000000a7,0x00000007,0x0004003b, +0x00000008,0x000000b5,0x00000007,0x0004003b, +0x00000013,0x000000bf,0x00000007,0x0004003b, +0x00000008,0x000000c0,0x00000007,0x0004003b, +0x00000013,0x000000c2,0x00000007,0x0004003b, +0x00000013,0x000000c4,0x00000007,0x0004003b, +0x00000008,0x000000c9,0x00000007,0x0004003b, +0x00000013,0x000000cb,0x00000007,0x0004003b, +0x00000013,0x000000cd,0x00000007,0x0004003b, +0x00000008,0x000000d2,0x00000007,0x0004003b, +0x00000013,0x000000d4,0x00000007,0x0004003b, +0x00000013,0x000000d6,0x00000007,0x0004003b, +0x00000008,0x000000da,0x00000007,0x0004003b, +0x00000013,0x000000dc,0x00000007,0x0004003b, +0x00000013,0x000000de,0x00000007,0x0004003b, +0x00000008,0x000000e2,0x00000007,0x0004003b, +0x00000013,0x000000e4,0x00000007,0x0004003b, +0x00000013,0x000000e6,0x00000007,0x0004003b, +0x00000008,0x000000eb,0x00000007,0x0004003b, +0x00000013,0x000000ed,0x00000007,0x0004003b, +0x00000013,0x000000ef,0x00000007,0x0004003b, +0x00000008,0x000000f3,0x00000007,0x0004003b, +0x00000013,0x000000f5,0x00000007,0x0004003b, +0x00000013,0x000000f7,0x00000007,0x0004003b, +0x00000008,0x000000fc,0x00000007,0x0004003b, +0x00000013,0x000000fe,0x00000007,0x0004003b, +0x00000013,0x00000100,0x00000007,0x0003003e, +0x0000001b,0x0000001c,0x0003003e,0x0000001d, +0x0000001e,0x0003003e,0x0000001f,0x00000020, +0x00050041,0x000000ae,0x000000af,0x000000ab, +0x000000ad,0x0004003d,0x00000006,0x000000b0, +0x000000af,0x00050085,0x00000006,0x000000b2, +0x000000b0,0x000000b1,0x0004003d,0x00000006, +0x000000b3,0x0000001f,0x00050085,0x00000006, +0x000000b4,0x000000b2,0x000000b3,0x0003003e, +0x000000a7,0x000000b4,0x0004003d,0x00000007, +0x000000b8,0x000000b7,0x00050041,0x000000ba, +0x000000bb,0x000000ab,0x000000b9,0x0004003d, +0x000000a8,0x000000bc,0x000000bb,0x0007004f, +0x00000007,0x000000bd,0x000000bc,0x000000bc, +0x00000000,0x00000000,0x00050088,0x00000007, +0x000000be,0x000000b8,0x000000bd,0x0003003e, +0x000000b5,0x000000be,0x0003003e,0x000000bf, +0x00000041,0x0004003d,0x00000007,0x000000c1, +0x000000b5,0x0003003e,0x000000c0,0x000000c1, +0x0004003d,0x00000006,0x000000c3,0x000000a7, +0x0003003e,0x000000c2,0x000000c3,0x0003003e, +0x000000c4,0x00000042,0x00070039,0x00000006, +0x000000c5,0x00000018,0x000000c0,0x000000c2, +0x000000c4,0x0004003d,0x00000006,0x000000c6, +0x000000bf,0x00050081,0x00000006,0x000000c7, +0x000000c6,0x000000c5,0x0003003e,0x000000bf, +0x000000c7,0x0004003d,0x00000007,0x000000ca, +0x000000b5,0x0003003e,0x000000c9,0x000000ca, +0x0004003d,0x00000006,0x000000cc,0x000000a7, +0x0003003e,0x000000cb,0x000000cc,0x0003003e, +0x000000cd,0x000000c8,0x00070039,0x00000006, +0x000000ce,0x00000018,0x000000c9,0x000000cb, +0x000000cd,0x0004003d,0x00000006,0x000000cf, +0x000000bf,0x00050081,0x00000006,0x000000d0, +0x000000cf,0x000000ce,0x0003003e,0x000000bf, +0x000000d0,0x0004003d,0x00000007,0x000000d3, +0x000000b5,0x0003003e,0x000000d2,0x000000d3, +0x0004003d,0x00000006,0x000000d5,0x000000a7, +0x0003003e,0x000000d4,0x000000d5,0x0003003e, +0x000000d6,0x000000d1,0x00070039,0x00000006, +0x000000d7,0x00000018,0x000000d2,0x000000d4, +0x000000d6,0x0004003d,0x00000006,0x000000d8, +0x000000bf,0x00050081,0x00000006,0x000000d9, +0x000000d8,0x000000d7,0x0003003e,0x000000bf, +0x000000d9,0x0004003d,0x00000007,0x000000db, +0x000000b5,0x0003003e,0x000000da,0x000000db, +0x0004003d,0x00000006,0x000000dd,0x000000a7, +0x0003003e,0x000000dc,0x000000dd,0x0003003e, +0x000000de,0x0000001e,0x00070039,0x00000006, +0x000000df,0x00000018,0x000000da,0x000000dc, +0x000000de,0x0004003d,0x00000006,0x000000e0, +0x000000bf,0x00050081,0x00000006,0x000000e1, +0x000000e0,0x000000df,0x0003003e,0x000000bf, +0x000000e1,0x0004003d,0x00000007,0x000000e3, +0x000000b5,0x0003003e,0x000000e2,0x000000e3, +0x0004003d,0x00000006,0x000000e5,0x000000a7, +0x0003003e,0x000000e4,0x000000e5,0x0003003e, +0x000000e6,0x000000b1,0x00070039,0x00000006, +0x000000e7,0x00000018,0x000000e2,0x000000e4, +0x000000e6,0x0004003d,0x00000006,0x000000e8, +0x000000bf,0x00050081,0x00000006,0x000000e9, +0x000000e8,0x000000e7,0x0003003e,0x000000bf, +0x000000e9,0x0004003d,0x00000007,0x000000ec, +0x000000b5,0x0003003e,0x000000eb,0x000000ec, +0x0004003d,0x00000006,0x000000ee,0x000000a7, +0x0003003e,0x000000ed,0x000000ee,0x0003003e, +0x000000ef,0x000000ea,0x00070039,0x00000006, +0x000000f0,0x00000018,0x000000eb,0x000000ed, +0x000000ef,0x0004003d,0x00000006,0x000000f1, +0x000000bf,0x00050081,0x00000006,0x000000f2, +0x000000f1,0x000000f0,0x0003003e,0x000000bf, +0x000000f2,0x0004003d,0x00000007,0x000000f4, +0x000000b5,0x0003003e,0x000000f3,0x000000f4, +0x0004003d,0x00000006,0x000000f6,0x000000a7, +0x0003003e,0x000000f5,0x000000f6,0x0003003e, +0x000000f7,0x0000006a,0x00070039,0x00000006, +0x000000f8,0x00000018,0x000000f3,0x000000f5, +0x000000f7,0x0004003d,0x00000006,0x000000f9, +0x000000bf,0x00050081,0x00000006,0x000000fa, +0x000000f9,0x000000f8,0x0003003e,0x000000bf, +0x000000fa,0x0004003d,0x00000007,0x000000fd, +0x000000b5,0x0003003e,0x000000fc,0x000000fd, +0x0004003d,0x00000006,0x000000ff,0x000000a7, +0x0003003e,0x000000fe,0x000000ff,0x0003003e, +0x00000100,0x000000fb,0x00070039,0x00000006, +0x00000101,0x00000018,0x000000fc,0x000000fe, +0x00000100,0x0004003d,0x00000006,0x00000102, +0x000000bf,0x00050081,0x00000006,0x00000103, +0x00000102,0x00000101,0x0003003e,0x000000bf, +0x00000103,0x0004003d,0x00000006,0x00000104, +0x000000bf,0x00050041,0x00000013,0x00000105, +0x000000b5,0x00000034,0x0004003d,0x00000006, +0x00000106,0x00000105,0x00050085,0x00000006, +0x00000107,0x00000106,0x0000008c,0x0007000c, +0x00000006,0x00000108,0x00000001,0x00000025, +0x00000107,0x00000042,0x00050085,0x00000006, +0x00000109,0x00000104,0x00000108,0x0003003e, +0x000000bf,0x00000109,0x0004003d,0x00000006, +0x0000010c,0x000000bf,0x00070050,0x000000a8, +0x0000010d,0x00000042,0x00000042,0x00000042, +0x0000010c,0x0003003e,0x0000010b,0x0000010d, +0x000100fd,0x00010038,0x00050036,0x00000006, +0x0000000b,0x00000000,0x00000009,0x00030037, +0x00000008,0x0000000a,0x000200f8,0x0000000c, +0x0004003d,0x00000007,0x00000021,0x0000000a, +0x00050094,0x00000006,0x00000025,0x00000021, +0x00000024,0x0006000c,0x00000006,0x00000026, +0x00000001,0x0000000d,0x00000025,0x00050085, +0x00000006,0x00000028,0x00000026,0x00000027, +0x0006000c,0x00000006,0x00000029,0x00000001, +0x0000000a,0x00000028,0x000200fe,0x00000029, +0x00010038,0x00050036,0x00000006,0x0000000e, +0x00000000,0x00000009,0x00030037,0x00000008, +0x0000000d,0x000200f8,0x0000000f,0x0004003b, +0x00000013,0x0000002c,0x00000007,0x00050041, +0x00000013,0x0000002f,0x0000000d,0x0000002e, +0x0004003d,0x00000006,0x00000030,0x0000002f, +0x00050041,0x00000013,0x00000031,0x0000000d, +0x0000002e,0x0004003d,0x00000006,0x00000032, +0x00000031,0x00050085,0x00000006,0x00000033, +0x00000030,0x00000032,0x00050041,0x00000013, +0x00000035,0x0000000d,0x00000034,0x0004003d, +0x00000006,0x00000036,0x00000035,0x00050041, +0x00000013,0x00000037,0x0000000d,0x00000034, +0x0004003d,0x00000006,0x00000038,0x00000037, +0x00050085,0x00000006,0x00000039,0x00000036, +0x00000038,0x00050081,0x00000006,0x0000003a, +0x00000033,0x00000039,0x0006000c,0x00000006, +0x0000003b,0x00000001,0x0000001f,0x0000003a, +0x0004003d,0x00000006,0x0000003d,0x0000001b, +0x00050088,0x00000006,0x0000003e,0x0000003c, +0x0000003d,0x00050085,0x00000006,0x0000003f, +0x0000003b,0x0000003e,0x0003003e,0x0000002c, +0x0000003f,0x0004003d,0x00000006,0x00000040, +0x0000002c,0x0008000c,0x00000006,0x00000043, +0x00000001,0x0000002b,0x00000040,0x00000041, +0x00000042,0x0003003e,0x0000002c,0x00000043, +0x0004003d,0x00000006,0x00000044,0x0000002c, +0x00050085,0x00000006,0x00000046,0x00000044, +0x00000045,0x0006000c,0x00000006,0x00000047, +0x00000001,0x0000000e,0x00000046,0x00050085, +0x00000006,0x00000048,0x00000047,0x0000001e, +0x000200fe,0x00000048,0x00010038,0x00050036, +0x00000006,0x00000011,0x00000000,0x00000009, +0x00030037,0x00000008,0x00000010,0x000200f8, +0x00000012,0x0004003b,0x00000013,0x0000004b, +0x00000007,0x0004003b,0x00000008,0x0000004d, +0x00000007,0x0004003b,0x00000013,0x00000053, +0x00000007,0x0004003b,0x00000008,0x00000054, +0x00000007,0x0004003b,0x00000008,0x00000061, +0x00000007,0x0004003b,0x00000008,0x0000006c, +0x00000007,0x0004003b,0x00000008,0x00000072, +0x00000007,0x0004003b,0x00000008,0x00000076, +0x00000007,0x0003003e,0x0000004b,0x0000004c, +0x0004003d,0x00000007,0x0000004e,0x00000010, +0x0004003d,0x00000006,0x0000004f,0x0000004b, +0x00050050,0x00000007,0x00000050,0x0000004f, +0x0000004f,0x00050088,0x00000007,0x00000051, +0x0000004e,0x00000050,0x0006000c,0x00000007, +0x00000052,0x00000001,0x00000008,0x00000051, +0x0003003e,0x0000004d,0x00000052,0x0004003d, +0x00000007,0x00000055,0x0000004d,0x0003003e, +0x00000054,0x00000055,0x00050039,0x00000006, +0x00000056,0x0000000b,0x00000054,0x0003003e, +0x00000053,0x00000056,0x0004003d,0x00000006, +0x00000057,0x00000053,0x0004003d,0x00000006, +0x00000059,0x0000001d,0x00050085,0x00000006, +0x0000005a,0x00000059,0x0000003c,0x00050085, +0x00000006,0x0000005b,0x00000058,0x0000005a, +0x000500ba,0x0000005c,0x0000005d,0x00000057, +0x0000005b,0x000300f7,0x0000005f,0x00000000, +0x000400fa,0x0000005d,0x0000005e,0x0000005f, +0x000200f8,0x0000005e,0x000200fe,0x00000041, +0x000200f8,0x0000005f,0x0004003d,0x00000006, +0x00000062,0x00000053,0x00050085,0x00000006, +0x00000064,0x00000062,0x00000063,0x0006000c, +0x00000006,0x00000065,0x00000001,0x0000000a, +0x00000064,0x0004003d,0x00000006,0x00000066, +0x00000053,0x00050050,0x00000007,0x00000067, +0x00000065,0x00000066,0x00050081,0x00000007, +0x00000069,0x00000067,0x00000068,0x0005008e, +0x00000007,0x0000006b,0x00000069,0x0000006a, +0x0003003e,0x00000061,0x0000006b,0x0004003d, +0x00000007,0x0000006d,0x00000010,0x0004003d, +0x00000006,0x0000006e,0x0000004b,0x00050050, +0x00000007,0x0000006f,0x0000006e,0x0000006e, +0x00050088,0x00000007,0x00000070,0x0000006d, +0x0000006f,0x0006000c,0x00000007,0x00000071, +0x00000001,0x0000000a,0x00000070,0x0003003e, +0x0000006c,0x00000071,0x0004003d,0x00000007, +0x00000073,0x0000006c,0x0004003d,0x00000007, +0x00000074,0x00000061,0x00050083,0x00000007, +0x00000075,0x00000073,0x00000074,0x0003003e, +0x00000072,0x00000075,0x0004003d,0x00000007, +0x00000077,0x00000072,0x0003003e,0x00000076, +0x00000077,0x00050039,0x00000006,0x00000078, +0x0000000e,0x00000076,0x000200fe,0x00000078, +0x00010038,0x00050036,0x00000006,0x00000018, +0x00000000,0x00000014,0x00030037,0x00000008, +0x00000015,0x00030037,0x00000013,0x00000016, +0x00030037,0x00000013,0x00000017,0x000200f8, +0x00000019,0x0004003b,0x00000008,0x0000009f, +0x00000007,0x00050041,0x00000013,0x0000007b, +0x00000015,0x00000034,0x0004003d,0x00000006, +0x0000007c,0x0000007b,0x00050085,0x00000006, +0x0000007e,0x0000007c,0x0000007d,0x0004003d, +0x00000006,0x0000007f,0x00000016,0x00050085, +0x00000006,0x00000081,0x0000007f,0x00000080, +0x00050085,0x00000006,0x00000082,0x00000081, +0x00000063,0x00050081,0x00000006,0x00000083, +0x0000007e,0x00000082,0x0004003d,0x00000006, +0x00000084,0x00000017,0x00050088,0x00000006, +0x00000085,0x00000042,0x00000084,0x00050081, +0x00000006,0x00000086,0x00000083,0x00000085, +0x0006000c,0x00000006,0x00000087,0x00000001, +0x0000000e,0x00000086,0x0004003d,0x00000006, +0x00000089,0x00000017,0x00050088,0x00000006, +0x0000008a,0x00000088,0x00000089,0x00050088, +0x00000006,0x0000008b,0x00000087,0x0000008a, +0x00050085,0x00000006,0x0000008d,0x0000008b, +0x0000008c,0x00050041,0x00000013,0x0000008e, +0x00000015,0x0000002e,0x0004003d,0x00000006, +0x0000008f,0x0000008e,0x00050081,0x00000006, +0x00000090,0x0000008f,0x0000008d,0x00050041, +0x00000013,0x00000091,0x00000015,0x0000002e, +0x0003003e,0x00000091,0x00000090,0x0004003d, +0x00000006,0x00000092,0x00000016,0x0004003d, +0x00000006,0x00000093,0x00000017,0x00050085, +0x00000006,0x00000094,0x00000092,0x00000093, +0x0005008e,0x00000007,0x00000097,0x00000096, +0x00000094,0x0005008e,0x00000007,0x00000098, +0x00000097,0x0000008c,0x0004003d,0x00000007, +0x00000099,0x00000015,0x00050081,0x00000007, +0x0000009a,0x00000099,0x00000098,0x0003003e, +0x00000015,0x0000009a,0x0004003d,0x00000007, +0x0000009b,0x00000015,0x0004003d,0x00000006, +0x0000009c,0x00000017,0x00050050,0x00000007, +0x0000009d,0x0000009c,0x0000009c,0x00050088, +0x00000007,0x0000009e,0x0000009b,0x0000009d, +0x0003003e,0x0000009f,0x0000009e,0x00050039, +0x00000006,0x000000a0,0x00000011,0x0000009f, +0x0004003d,0x00000006,0x000000a1,0x00000017, +0x00050085,0x00000006,0x000000a2,0x000000a1, +0x0000001e,0x00050081,0x00000006,0x000000a3, +0x000000a2,0x0000001e,0x00050085,0x00000006, +0x000000a4,0x000000a0,0x000000a3,0x000200fe, +0x000000a4,0x00010038} diff --git a/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert.inc b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert.inc new file mode 100644 index 0000000000..64fe4a3ae2 --- /dev/null +++ b/gfx/drivers/vulkan_shaders/pipeline_snow_simple.vert.inc @@ -0,0 +1,75 @@ +{0x07230203,0x00010000,0x00080001,0x00000025, +0x00000000,0x00020011,0x00000001,0x0006000b, +0x00000001,0x4c534c47,0x6474732e,0x3035342e, +0x00000000,0x0003000e,0x00000000,0x00000001, +0x0009000f,0x00000000,0x00000004,0x6e69616d, +0x00000000,0x0000000a,0x00000016,0x00000021, +0x00000024,0x00030003,0x00000001,0x00000136, +0x000a0004,0x475f4c47,0x4c474f4f,0x70635f45, +0x74735f70,0x5f656c79,0x656e696c,0x7269645f, +0x69746365,0x00006576,0x00080004,0x475f4c47, +0x4c474f4f,0x6e695f45,0x64756c63,0x69645f65, +0x74636572,0x00657669,0x00040005,0x00000004, +0x6e69616d,0x00000000,0x00060005,0x00000008, +0x505f6c67,0x65567265,0x78657472,0x00000000, +0x00060006,0x00000008,0x00000000,0x505f6c67, +0x7469736f,0x006e6f69,0x00070006,0x00000008, +0x00000001,0x505f6c67,0x746e696f,0x657a6953, +0x00000000,0x00030005,0x0000000a,0x00000000, +0x00030005,0x0000000e,0x004f4255,0x00040006, +0x0000000e,0x00000000,0x0050564d,0x00040005, +0x00000010,0x626f6c67,0x00006c61,0x00050005, +0x00000016,0x43786554,0x64726f6f,0x00000000, +0x00050005,0x00000021,0x78655476,0x726f6f43, +0x00000064,0x00050005,0x00000024,0x69736f50, +0x6e6f6974,0x00000000,0x00050048,0x00000008, +0x00000000,0x0000000b,0x00000000,0x00050048, +0x00000008,0x00000001,0x0000000b,0x00000001, +0x00030047,0x00000008,0x00000002,0x00040048, +0x0000000e,0x00000000,0x00000005,0x00050048, +0x0000000e,0x00000000,0x00000023,0x00000000, +0x00050048,0x0000000e,0x00000000,0x00000007, +0x00000010,0x00030047,0x0000000e,0x00000002, +0x00040047,0x00000010,0x00000022,0x00000000, +0x00040047,0x00000010,0x00000021,0x00000000, +0x00040047,0x00000016,0x0000001e,0x00000001, +0x00040047,0x00000021,0x0000001e,0x00000000, +0x00040047,0x00000024,0x0000001e,0x00000000, +0x00020013,0x00000002,0x00030021,0x00000003, +0x00000002,0x00030016,0x00000006,0x00000020, +0x00040017,0x00000007,0x00000006,0x00000004, +0x0004001e,0x00000008,0x00000007,0x00000006, +0x00040020,0x00000009,0x00000003,0x00000008, +0x0004003b,0x00000009,0x0000000a,0x00000003, +0x00040015,0x0000000b,0x00000020,0x00000001, +0x0004002b,0x0000000b,0x0000000c,0x00000000, +0x00040018,0x0000000d,0x00000007,0x00000004, +0x0003001e,0x0000000e,0x0000000d,0x00040020, +0x0000000f,0x00000002,0x0000000e,0x0004003b, +0x0000000f,0x00000010,0x00000002,0x00040020, +0x00000011,0x00000002,0x0000000d,0x00040017, +0x00000014,0x00000006,0x00000002,0x00040020, +0x00000015,0x00000001,0x00000014,0x0004003b, +0x00000015,0x00000016,0x00000001,0x0004002b, +0x00000006,0x00000018,0x00000000,0x0004002b, +0x00000006,0x00000019,0x3f800000,0x00040020, +0x0000001e,0x00000003,0x00000007,0x00040020, +0x00000020,0x00000003,0x00000014,0x0004003b, +0x00000020,0x00000021,0x00000003,0x00040020, +0x00000023,0x00000001,0x00000007,0x0004003b, +0x00000023,0x00000024,0x00000001,0x00050036, +0x00000002,0x00000004,0x00000000,0x00000003, +0x000200f8,0x00000005,0x00050041,0x00000011, +0x00000012,0x00000010,0x0000000c,0x0004003d, +0x0000000d,0x00000013,0x00000012,0x0004003d, +0x00000014,0x00000017,0x00000016,0x00050051, +0x00000006,0x0000001a,0x00000017,0x00000000, +0x00050051,0x00000006,0x0000001b,0x00000017, +0x00000001,0x00070050,0x00000007,0x0000001c, +0x0000001a,0x0000001b,0x00000018,0x00000019, +0x00050091,0x00000007,0x0000001d,0x00000013, +0x0000001c,0x00050041,0x0000001e,0x0000001f, +0x0000000a,0x0000000c,0x0003003e,0x0000001f, +0x0000001d,0x0004003d,0x00000014,0x00000022, +0x00000016,0x0003003e,0x00000021,0x00000022, +0x000100fd,0x00010038} From 8366b26d36e05daf08cfe240ddba079eb5dd38f7 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 03:54:53 -0600 Subject: [PATCH 055/205] Switch XMB Tabs (Music,Video) --- menu/cbs/menu_cbs_title.c | 4 ++-- menu/drivers/xmb.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index ed69c9907c..79f0d22f8d 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -240,12 +240,12 @@ static int action_get_title_group_settings(const char *path, const char *label, strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MAIN_MENU), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HISTORY_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), len); - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB))) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_IMAGES_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_IMAGES_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MUSIC_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MUSIC_TAB), len); + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB))) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SETTINGS_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB))) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 75779ca2aa..4ccee2188f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -139,8 +139,8 @@ enum XMB_SYSTEM_TAB_SETTINGS, XMB_SYSTEM_TAB_HISTORY, #ifdef HAVE_FFMPEG - XMB_SYSTEM_TAB_VIDEO, XMB_SYSTEM_TAB_MUSIC, + XMB_SYSTEM_TAB_VIDEO, #endif #ifdef HAVE_IMAGEVIEWER XMB_SYSTEM_TAB_IMAGES, @@ -1404,10 +1404,10 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i) return &xmb->images_tab_node; #endif #ifdef HAVE_FFMPEG - case XMB_SYSTEM_TAB_VIDEO: - return &xmb->video_tab_node; case XMB_SYSTEM_TAB_MUSIC: return &xmb->music_tab_node; + case XMB_SYSTEM_TAB_VIDEO: + return &xmb->video_tab_node; #endif case XMB_SYSTEM_TAB_HISTORY: return &xmb->history_tab_node; @@ -3045,10 +3045,10 @@ static void *xmb_init(void **userdata) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; #endif #ifdef HAVE_FFMPEG - if (settings->menu.xmb.show_video) - xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; if (settings->menu.xmb.show_music) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC; + if (settings->menu.xmb.show_video) + xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; #endif #ifdef HAVE_LIBRETRODB xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD; @@ -3587,18 +3587,18 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action break; #endif #ifdef HAVE_FFMPEG - case XMB_SYSTEM_TAB_VIDEO: - menu_stack->list[stack_size - 1].label = - strdup(msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB)); - menu_stack->list[stack_size - 1].type = - MENU_VIDEO_TAB; - break; case XMB_SYSTEM_TAB_MUSIC: menu_stack->list[stack_size - 1].label = strdup(msg_hash_to_str(MENU_ENUM_LABEL_MUSIC_TAB)); menu_stack->list[stack_size - 1].type = MENU_MUSIC_TAB; break; + case XMB_SYSTEM_TAB_VIDEO: + menu_stack->list[stack_size - 1].label = + strdup(msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB)); + menu_stack->list[stack_size - 1].type = + MENU_VIDEO_TAB; + break; #endif case XMB_SYSTEM_TAB_HISTORY: menu_stack->list[stack_size - 1].label = From 257107a69d05ed9425f898988c6584aa09b372c9 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 04:04:13 -0600 Subject: [PATCH 056/205] Rename Images->Image (XMB Style) --- intl/msg_hash_eo.h | 2 +- intl/msg_hash_fr.h | 2 +- intl/msg_hash_ru.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 8974034951..4bd40de65b 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -571,7 +571,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 6b228b4da8..ad23ab5a5d 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -567,7 +567,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 0ac4afd22c..31981310f7 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -571,7 +571,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 5b972159ac..aa500cd30f 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -577,7 +577,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 62abe2e732..6e7840cdd0 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2252,7 +2252,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU: return "Horizontal Menu"; case MENU_ENUM_LABEL_VALUE_IMAGES_TAB: - return "Images"; + return "Image"; case MENU_ENUM_LABEL_VALUE_INFORMATION: return "Information"; case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST: From 754b9c1ddab509ee1cc94e52e3a68e16d8b90af9 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 04:14:27 -0600 Subject: [PATCH 057/205] Rename Search:->Search (XMB Style) --- intl/msg_hash_eo.h | 2 +- intl/msg_hash_ru.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 4bd40de65b..bfe1c74bb4 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1171,7 +1171,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 31981310f7..b96282af5b 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1171,7 +1171,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index aa500cd30f..b8c36c8c3f 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1189,7 +1189,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 6e7840cdd0..8766639869 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2846,7 +2846,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION: return "Screen Resolution"; case MENU_ENUM_LABEL_VALUE_SEARCH: - return "Search:"; + return "Search"; case MENU_ENUM_LABEL_VALUE_SECONDS: return "seconds"; case MENU_ENUM_LABEL_VALUE_SETTINGS: From f9b44bbcf6dc066ef41efce1cb8df40c767fef91 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 12:29:37 +0100 Subject: [PATCH 058/205] Cleanups --- audio/audio_resampler_driver.c | 13 ------------- audio/audio_resampler_driver.h | 9 --------- menu/menu_setting.c | 13 +++++++++++++ 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c index fdc32ab1e8..5de5a4e1aa 100644 --- a/audio/audio_resampler_driver.c +++ b/audio/audio_resampler_driver.c @@ -22,7 +22,6 @@ #include "audio_resampler_driver.h" #include "../config_file_userdata.h" #include "../performance_counters.h" -#include "../list_special.h" static const rarch_resampler_t *resampler_drivers[] = { &sinc_resampler, @@ -90,18 +89,6 @@ const char *audio_resampler_driver_find_ident(int idx) return drv->ident; } -/** - * config_get_audio_resampler_driver_options: - * - * Get an enumerated list of all resampler driver names, separated by '|'. - * - * Returns: string listing of all resampler driver names, separated by '|'. - **/ -const char* config_get_audio_resampler_driver_options(void) -{ - return char_list_new_special(STRING_LIST_AUDIO_RESAMPLER_DRIVERS, NULL); -} - /** * find_resampler_driver: * @ident : Identifier of resampler driver to find. diff --git a/audio/audio_resampler_driver.h b/audio/audio_resampler_driver.h index 7f3f995930..5fd0e3bf38 100644 --- a/audio/audio_resampler_driver.h +++ b/audio/audio_resampler_driver.h @@ -139,15 +139,6 @@ extern rarch_resampler_t CC_resampler; extern rarch_resampler_t nearest_resampler; extern rarch_resampler_t null_resampler; -/** - * config_get_audio_resampler_driver_options: - * - * Get an enumerated list of all resampler driver names, separated by '|'. - * - * Returns: string listing of all resampler driver names, separated by '|'. - **/ -const char* config_get_audio_resampler_driver_options(void); - /** * audio_resampler_driver_find_handle: * @index : index of driver to get handle to. diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 90082d721e..9e777fb192 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -61,6 +61,7 @@ #include "../dirs.h" #include "../paths.h" #include "../dynamic.h" +#include "../list_special.h" #include "../runloop.h" #include "../verbosity.h" #include "../camera/camera_driver.h" @@ -2122,6 +2123,18 @@ static bool setting_append_list_input_player_options( return true; } +/** + * config_get_audio_resampler_driver_options: + * + * Get an enumerated list of all resampler driver names, separated by '|'. + * + * Returns: string listing of all resampler driver names, separated by '|'. + **/ +static const char* config_get_audio_resampler_driver_options(void) +{ + return char_list_new_special(STRING_LIST_AUDIO_RESAMPLER_DRIVERS, NULL); +} + static bool setting_append_list( enum settings_list_type type, rarch_setting_t **list, From 8042c2ac62ae2409e2cc16432708e85be6e97e76 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 12:36:46 +0100 Subject: [PATCH 059/205] Move config_file_userdata.c to libretro-common --- Makefile.common | 2 +- audio/audio_dsp_filter.c | 2 +- audio/audio_resampler_driver.c | 10 ++-------- gfx/video_filter.c | 2 +- griffin/griffin.c | 2 +- .../file/config_file_userdata.c | 2 +- .../include/file/config_file_userdata.h | 0 7 files changed, 7 insertions(+), 13 deletions(-) rename config_file_userdata.c => libretro-common/file/config_file_userdata.c (99%) rename config_file_userdata.h => libretro-common/include/file/config_file_userdata.h (100%) diff --git a/Makefile.common b/Makefile.common index 91070f8928..20b2a0e1e0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -199,7 +199,7 @@ OBJ += frontend/frontend.o \ managers/cheat_manager.o \ core_info.o \ $(LIBRETRO_COMM_DIR)/file/config_file.o \ - config_file_userdata.o \ + $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \ tasks/task_screenshot.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \ gfx/drivers_shader/shader_null.o \ diff --git a/audio/audio_dsp_filter.c b/audio/audio_dsp_filter.c index aaa948070e..1ca916ed6e 100644 --- a/audio/audio_dsp_filter.c +++ b/audio/audio_dsp_filter.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include "audio_dsp_filter.h" #include "audio_filters/dspfilter.h" -#include "../config_file_userdata.h" #include "../frontend/frontend_driver.h" #include "../performance_counters.h" #include "../dynamic.h" diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c index 5de5a4e1aa..209cd2cbef 100644 --- a/audio/audio_resampler_driver.c +++ b/audio/audio_resampler_driver.c @@ -18,10 +18,9 @@ #include #include +#include #include "audio_resampler_driver.h" -#include "../config_file_userdata.h" -#include "../performance_counters.h" static const rarch_resampler_t *resampler_drivers[] = { &sinc_resampler, @@ -108,11 +107,6 @@ static const rarch_resampler_t *find_resampler_driver(const char *ident) return resampler_drivers[0]; } -static resampler_simd_mask_t resampler_get_cpu_features(void) -{ - return cpu_features_get(); -} - /** * resampler_append_plugs: * @re : Resampler handle @@ -127,7 +121,7 @@ static bool resampler_append_plugs(void **re, const rarch_resampler_t **backend, double bw_ratio) { - resampler_simd_mask_t mask = resampler_get_cpu_features(); + resampler_simd_mask_t mask = cpu_features_get(); *re = (*backend)->init(&resampler_config, bw_ratio, mask); diff --git a/gfx/video_filter.c b/gfx/video_filter.c index f082811a62..6eb5de5843 100644 --- a/gfx/video_filter.c +++ b/gfx/video_filter.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #endif #include "../frontend/frontend_driver.h" -#include "../config_file_userdata.h" #include "../dynamic.h" #include "../performance_counters.h" #include "../verbosity.h" diff --git a/griffin/griffin.c b/griffin/griffin.c index df953b780d..8c8b619506 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -122,7 +122,7 @@ CONFIG FILE #endif #include "../libretro-common/file/config_file.c" -#include "../config_file_userdata.c" +#include "../libretro-common/file/config_file_userdata.c" #include "../managers/core_option_manager.c" /*============================================================ diff --git a/config_file_userdata.c b/libretro-common/file/config_file_userdata.c similarity index 99% rename from config_file_userdata.c rename to libretro-common/file/config_file_userdata.c index f4544c68a2..b1ff8138e2 100644 --- a/config_file_userdata.c +++ b/libretro-common/file/config_file_userdata.c @@ -23,7 +23,7 @@ #include #include -#include "config_file_userdata.h" +#include int config_userdata_get_float(void *userdata, const char *key_str, float *value, float default_value) diff --git a/config_file_userdata.h b/libretro-common/include/file/config_file_userdata.h similarity index 100% rename from config_file_userdata.h rename to libretro-common/include/file/config_file_userdata.h From 9375efe24e6f4aaab47d5e9a46b126055e542630 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 12:44:29 +0100 Subject: [PATCH 060/205] Add HAVE_CC_RESAMPLER defines --- Makefile | 2 +- Makefile.ps3 | 2 +- Makefile.psl1ght | 2 +- Makefile.psp1 | 2 +- Makefile.wiiu | 2 +- audio/audio_resampler_driver.c | 2 ++ audio/audio_resampler_driver.h | 2 ++ pkg/android/phoenix/jni/Android.mk | 2 +- pkg/apple/RetroArch.xcodeproj/project.pbxproj | 4 ++++ .../RetroArch_PPC.xcodeproj/project.pbxproj | 2 ++ .../RetroArch_iOS.xcodeproj/project.pbxproj | 11 +++++++++++ .../RetroArch_iOS10.xcodeproj/project.pbxproj | 14 ++++++++++++++ pkg/msvc/RetroArch-360/RetroArch-360.vcxproj | 12 ++++++------ pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj | 14 +++++++------- pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj | 4 ++-- pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 16 ++++++++-------- 16 files changed, 64 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index bd050a315b..22bc87b4c1 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ endif OBJ := LIBS := -DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY +DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"' ifneq ($(findstring Win32,$(OS)),) diff --git a/Makefile.ps3 b/Makefile.ps3 index 1b3cb4dc2b..4af7a1e088 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1) DEFINES += -DHAVE_RLAUNCH endif -DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY +DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER ifeq ($(HAVE_GCMGL), 1) DEFINES += -DHAVE_GCMGL diff --git a/Makefile.psl1ght b/Makefile.psl1ght index f570901a16..2ca0fefbef 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -89,7 +89,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER endif -SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts +SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER CFLAGS += -std=gnu99 $(SHARED_FLAGS) CXXFLAGS += $(SHARED_FLAGS) diff --git a/Makefile.psp1 b/Makefile.psp1 index 924366b7e1..f88d5062cb 100644 --- a/Makefile.psp1 +++ b/Makefile.psp1 @@ -23,7 +23,7 @@ INCDIR = deps/zlib deps/7zip libretro-common/include CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math ASFLAGS = $(CFLAGS) -RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP +RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER LIBDIR = LDFLAGS = diff --git a/Makefile.wiiu b/Makefile.wiiu index 26a80520e1..83bbdb4fa6 100644 --- a/Makefile.wiiu +++ b/Makefile.wiiu @@ -20,7 +20,7 @@ DEFINES := ifeq ($(GRIFFIN_BUILD), 1) OBJ += griffin/griffin.o DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB - DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB + DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER # DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI else HAVE_MENU_COMMON = 1 diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c index 209cd2cbef..fe9cdc8ac9 100644 --- a/audio/audio_resampler_driver.c +++ b/audio/audio_resampler_driver.c @@ -24,7 +24,9 @@ static const rarch_resampler_t *resampler_drivers[] = { &sinc_resampler, +#ifdef HAVE_CC_RESAMPLER &CC_resampler, +#endif &nearest_resampler, &null_resampler, NULL, diff --git a/audio/audio_resampler_driver.h b/audio/audio_resampler_driver.h index 5fd0e3bf38..93bebd70b0 100644 --- a/audio/audio_resampler_driver.h +++ b/audio/audio_resampler_driver.h @@ -135,7 +135,9 @@ typedef struct audio_frame_float } audio_frame_float_t; extern rarch_resampler_t sinc_resampler; +#ifdef HAVE_CC_RESAMPLER extern rarch_resampler_t CC_resampler; +#endif extern rarch_resampler_t nearest_resampler; extern rarch_resampler_t null_resampler; diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index e80b7c6d3b..f8215fc9d2 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -64,7 +64,7 @@ else DEFINES += -DHAVE_OPENGLES2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index 9ad88caf09..8b2546862f 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -394,6 +394,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -460,6 +461,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -528,6 +530,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -593,6 +596,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj index 1d4b12b535..f981ea06ae 100644 --- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj @@ -292,6 +292,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -365,6 +366,7 @@ "-DOSX", "-DHAVE_OPENGL", "-DHAVE_FBO", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 6ee137def8..78c746a631 100644 --- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -534,6 +534,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -612,6 +613,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -661,6 +663,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -740,6 +743,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -813,6 +817,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -859,6 +864,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -938,6 +944,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-DHAVE_THREADS", @@ -1006,6 +1013,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-DHAVE_THREADS", @@ -1074,6 +1082,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1151,6 +1160,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1200,6 +1210,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj index 570ccef6df..5120349ab1 100644 --- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj @@ -649,6 +649,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -727,6 +728,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -776,6 +778,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -855,6 +858,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -928,6 +932,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -974,6 +979,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1047,6 +1053,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1124,6 +1131,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1173,6 +1181,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1256,6 +1265,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-DHAVE_THREADS", @@ -1324,6 +1334,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-DHAVE_THREADS", @@ -1392,6 +1403,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1469,6 +1481,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", @@ -1518,6 +1531,7 @@ "-DHAVE_FBO", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", + "-DHAVE_CC_RESAMPLER", "-DHAVE_GLSL", "-DINLINE=inline", "-D__LIBRETRO__", diff --git a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj index 97525c0a3d..2e803febf0 100644 --- a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -152,7 +152,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -192,7 +192,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -237,7 +237,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -279,7 +279,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -321,7 +321,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_CC_RESAMPLER;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) diff --git a/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index 833b19e97b..6f114b9c99 100644 --- a/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -22,7 +22,7 @@ Optimization="3" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" MinimalRebuild="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="1" @@ -72,7 +72,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -127,7 +127,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -188,7 +188,7 @@ EnableFiberSafeOptimizations="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;inline=_inline;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;inline=_inline;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -241,7 +241,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -300,7 +300,7 @@ EnableFiberSafeOptimizations="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;inline=_inline;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LANGEXTRA;inline=_inline;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -353,7 +353,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RGUI;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index eaa2e165a9..d87d971a00 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\..\..\gfx\include"" - PreprocessorDefinitions="_WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS" + PreprocessorDefinitions="_WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -69,7 +69,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -201,7 +201,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -221,7 +221,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -240,7 +240,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -262,7 +262,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -286,7 +286,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -311,7 +311,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -335,7 +335,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp From 7af2e2e6b8a0957b5189d79a4fa930032730fe45 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 12:48:04 +0100 Subject: [PATCH 061/205] Add HAVE_CC_RESAMPLER to more Makefiles --- Makefile | 3 ++- Makefile.common | 6 +++++- Makefile.ctr | 3 ++- Makefile.emscripten | 1 + Makefile.griffin | 1 + Makefile.win | 1 + griffin/griffin.c | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 22bc87b4c1..c31e4bdb95 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ HAVE_FILE_LOGGER=1 +HAVE_CC_RESAMPLER=1 NEED_CXX_LINKER=0 MISSING_DECLS =0 @@ -18,7 +19,7 @@ endif OBJ := LIBS := -DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER +DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"' ifneq ($(findstring Win32,$(OS)),) diff --git a/Makefile.common b/Makefile.common index 20b2a0e1e0..792725bb5b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -215,7 +215,6 @@ OBJ += frontend/frontend.o \ audio/drivers_resampler/sinc_resampler.o \ audio/drivers_resampler/nearest_resampler.o \ audio/drivers_resampler/null_resampler.o \ - audio/drivers_resampler/cc_resampler.o \ location/drivers/nulllocation.o \ camera/drivers/nullcamera.o \ wifi/drivers/nullwifi.o \ @@ -232,6 +231,11 @@ OBJ += frontend/frontend.o \ performance_counters.o \ verbosity.o +ifeq ($(HAVE_CC_RESAMPLER), 1) +DEFINES += -DHAVE_CC_RESAMPLER +OBJ += audio/drivers_resampler/cc_resampler.o +endif + ifeq ($(HAVE_LANGEXTRA), 1) DEFINES += -DHAVE_LANGEXTRA DEFINES += -finput-charset=UTF-8 diff --git a/Makefile.ctr b/Makefile.ctr index a5f9939eb5..ba6139c5be 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -44,9 +44,10 @@ endif DEFINES := ifeq ($(GRIFFIN_BUILD), 1) OBJ += griffin/griffin.o - DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB + DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB else + HAVE_CC_RESAMPLER = 1 HAVE_MENU_COMMON = 1 HAVE_RTGA = 1 HAVE_RPNG = 1 diff --git a/Makefile.emscripten b/Makefile.emscripten index d63c16aae4..1b420651c7 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -9,6 +9,7 @@ OBJ := DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD) DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN +HAVE_CC_RESAMPLER = 1 HAVE_EGL = 1 HAVE_OPENGLES = 1 HAVE_RJPEG = 0 diff --git a/Makefile.griffin b/Makefile.griffin index e0c234d14c..24505188e2 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -1,6 +1,7 @@ DEBUG = 0 HAVE_LOGGER = 0 HAVE_FILE_LOGGER = 0 +HAVE_CC_RESAMPLER = 1 WHOLE_ARCHIVE_LINK = 0 BIG_STACK = 1 PC_DEVELOPMENT_IP_ADDRESS = 255.255.255.255 diff --git a/Makefile.win b/Makefile.win index df7f2502dc..a198553aa7 100644 --- a/Makefile.win +++ b/Makefile.win @@ -32,6 +32,7 @@ HAVE_CG := 1 HAVE_LIBXML2 := 0 HAVE_ZLIB := 1 WANT_ZLIB := 1 +HAVE_CC_RESAMPLER := 1 ifeq ($(HAVE_CG), 1) CG_LIBS := -lcg -lcgGL diff --git a/griffin/griffin.c b/griffin/griffin.c index 8c8b619506..eedd19565a 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -560,7 +560,9 @@ AUDIO RESAMPLER #include "../audio/drivers_resampler/sinc_resampler.c" #include "../audio/drivers_resampler/nearest_resampler.c" #include "../audio/drivers_resampler/null_resampler.c" +#ifdef HAVE_CC_RESAMPLER #include "../audio/drivers_resampler/cc_resampler.c" +#endif /*============================================================ CAMERA From 08a60c94d0b85e35e46e0334aa781bbb061412c9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 13:02:29 +0100 Subject: [PATCH 062/205] Move audio resampler drivers (Sinc/nearest) to libretro-common; maister gave permission to relicense to MIT --- Makefile.common | 16 ++-- Makefile.griffin | 25 ++++--- audio/audio_driver.c | 8 +- audio/drivers_resampler/cc_resampler.c | 2 +- audio/drivers_resampler/null_resampler.c | 48 ------------ audio/drivers_resampler/sinc_resampler_neon.S | 66 ----------------- driver.c | 3 +- griffin/griffin.c | 8 +- .../{ => audio}/conversion/float_to_s16.c | 2 +- .../conversion/float_to_s16_neon.S | 0 .../conversion/float_to_s16_neon.c | 0 .../{ => audio}/conversion/s16_to_float.c | 2 +- .../conversion/s16_to_float_neon.S | 0 .../conversion/s16_to_float_neon.c | 0 .../audio/resampler/audio_resampler.c | 32 ++++---- .../resampler/drivers}/nearest_resampler.c | 30 +++++--- .../audio/resampler/drivers/null_resampler.c | 56 ++++++++++++++ .../audio/resampler/drivers}/sinc_resampler.c | 31 +++++--- .../resampler/drivers/sinc_resampler_neon.S | 74 +++++++++++++++++++ .../include/audio/audio_resampler.h | 35 +++++---- .../{ => audio}/conversion/float_to_s16.h | 0 .../{ => audio}/conversion/s16_to_float.h | 0 list_special.c | 3 +- menu/menu_setting.c | 3 +- .../RetroArch_iOS.xcodeproj/project.pbxproj | 2 +- .../RetroArch_iOS10.xcodeproj/project.pbxproj | 2 +- record/drivers/record_ffmpeg.c | 6 +- 27 files changed, 250 insertions(+), 204 deletions(-) delete mode 100644 audio/drivers_resampler/null_resampler.c delete mode 100644 audio/drivers_resampler/sinc_resampler_neon.S rename libretro-common/{ => audio}/conversion/float_to_s16.c (99%) rename libretro-common/{ => audio}/conversion/float_to_s16_neon.S (100%) rename libretro-common/{ => audio}/conversion/float_to_s16_neon.c (100%) rename libretro-common/{ => audio}/conversion/s16_to_float.c (99%) rename libretro-common/{ => audio}/conversion/s16_to_float_neon.S (100%) rename libretro-common/{ => audio}/conversion/s16_to_float_neon.c (100%) rename audio/audio_resampler_driver.c => libretro-common/audio/resampler/audio_resampler.c (72%) rename {audio/drivers_resampler => libretro-common/audio/resampler/drivers}/nearest_resampler.c (52%) create mode 100644 libretro-common/audio/resampler/drivers/null_resampler.c rename {audio/drivers_resampler => libretro-common/audio/resampler/drivers}/sinc_resampler.c (90%) create mode 100644 libretro-common/audio/resampler/drivers/sinc_resampler_neon.S rename audio/audio_resampler_driver.h => libretro-common/include/audio/audio_resampler.h (76%) rename libretro-common/include/{ => audio}/conversion/float_to_s16.h (100%) rename libretro-common/include/{ => audio}/conversion/s16_to_float.h (100%) diff --git a/Makefile.common b/Makefile.common index 792725bb5b..9b9fe49306 100644 --- a/Makefile.common +++ b/Makefile.common @@ -210,11 +210,11 @@ OBJ += frontend/frontend.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_filter.o \ gfx/font_driver.o \ gfx/video_filter.o \ - audio/audio_resampler_driver.o \ + $(LIBRETRO_COMM_DIR)/audio/resampler/audio_resampler.o \ audio/audio_dsp_filter.o \ - audio/drivers_resampler/sinc_resampler.o \ - audio/drivers_resampler/nearest_resampler.o \ - audio/drivers_resampler/null_resampler.o \ + $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \ + $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \ + $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \ location/drivers/nulllocation.o \ camera/drivers/nullcamera.o \ wifi/drivers/nullwifi.o \ @@ -431,12 +431,12 @@ ifeq ($(HAVE_NEON),1) DEFINES += -DSINC_LOWER_QUALITY endif -OBJ += $(LIBRETRO_COMM_DIR)/conversion/s16_to_float.o \ - $(LIBRETRO_COMM_DIR)/conversion/float_to_s16.o +OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float.o \ + $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16.o ifeq ($(HAVE_NEON),1) - OBJ += $(LIBRETRO_COMM_DIR)/conversion/s16_to_float_neon.o \ - $(LIBRETRO_COMM_DIR)/conversion/float_to_s16_neon.o + OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float_neon.o \ + $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16_neon.o endif ifneq ($(findstring Win32,$(OS)),) diff --git a/Makefile.griffin b/Makefile.griffin index 24505188e2..a36557e888 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -219,18 +219,19 @@ else ifeq ($(platform), vita) -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \ -lSceMotion_stub -lSceAppMgr_stub -lpng -lm -lc - PLATEXTRA := deps/libvita2d/shader/compiled/clear_v_gxp.o \ - deps/libvita2d/shader/compiled/clear_f_gxp.o \ - deps/libvita2d/shader/compiled/color_v_gxp.o \ - deps/libvita2d/shader/compiled/color_f_gxp.o \ - deps/libvita2d/shader/compiled/texture_v_gxp.o \ - deps/libvita2d/shader/compiled/texture_f_gxp.o \ - deps/libvita2d/shader/compiled/texture_tint_f_gxp.o - PLATOBJS += libretro-common/conversion/s16_to_float_neon.o \ - libretro-common/conversion/float_to_s16_neon.o \ - memory/neon/memcpy-neon.o \ - audio/drivers_resampler/sinc_resampler_neon.o \ - audio/drivers_resampler/cc_resampler_neon.o + PLATEXTRA := deps/libvita2d/shader/compiled/clear_v_gxp.o \ + deps/libvita2d/shader/compiled/clear_f_gxp.o \ + deps/libvita2d/shader/compiled/color_v_gxp.o \ + deps/libvita2d/shader/compiled/color_f_gxp.o \ + deps/libvita2d/shader/compiled/texture_v_gxp.o \ + deps/libvita2d/shader/compiled/texture_f_gxp.o \ + deps/libvita2d/shader/compiled/texture_tint_f_gxp.o + PLATOBJS += \ + libretro-common/conversion/s16_to_float_neon.o \ + libretro-common/conversion/float_to_s16_neon.o \ + memory/neon/memcpy-neon.o \ + libretro-common/audio/resampler/drivers/sinc_resampler_neon.o \ + audio/drivers_resampler/cc_resampler_neon.o LIBDIRS += -L. LDFLAGS += -Wl,-q diff --git a/audio/audio_driver.c b/audio/audio_driver.c index b951515f80..68e60ec4c5 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -19,8 +19,9 @@ #include #include -#include -#include +#include