ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17800 from pstef/fixes 

Corrections after recent fixes
This commit is contained in:
LibretroAdmin 2025-04-12 06:13:15 -07:00 committed by GitHub
parent 05adec60da ea9b86c9e7
commit 570290893b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps/dr/dr_mp3.h vendored
View File

@ -1064,12 +1064,22 @@ static void drmp3_L3_midside_stereo(float *left, int n)
int i = 0; int i = 0;
float *right = left + 576; float *right = left + 576;
#if DRMP3_HAVE_SIMD #if DRMP3_HAVE_SIMD
if (drmp3_have_simd()) for (; i < n - 3; i += 4) if (drmp3_have_simd())
{ {
drmp3_f4 vl = DRMP3_VLD(left + i); for (; i < n - 3; i += 4)
drmp3_f4 vr = DRMP3_VLD(right + i); {
DRMP3_VSTORE(left + i, DRMP3_VADD(vl, vr)); drmp3_f4 vl = DRMP3_VLD(left + i);
DRMP3_VSTORE(right + i, DRMP3_VSUB(vl, vr)); drmp3_f4 vr = DRMP3_VLD(right + i);
DRMP3_VSTORE(left + i, DRMP3_VADD(vl, vr));
DRMP3_VSTORE(right + i, DRMP3_VSUB(vl, vr));
}
#ifdef __GNUC__
/* Workaround for spurious -Waggressive-loop-optimizations warning from gcc.
* For more info see: https://github.com/lieff/minimp3/issues/88
*/
if (__builtin_constant_p(n % 4 == 0) && n % 4 == 0)
return;
#endif
} }
#endif #endif
for (; i < n; i++) for (; i < n; i++)

2
libretro-common/features/features_cpu.c
View File

@ -652,7 +652,7 @@ uint64_t cpu_features_get(void)
cpu |= RETRO_SIMD_MMX | RETRO_SIMD_SSE | RETRO_SIMD_MMXEXT; cpu |= RETRO_SIMD_MMX | RETRO_SIMD_SSE | RETRO_SIMD_MMXEXT;
#elif defined(CPU_X86) #elif defined(CPU_X86)
unsigned max_flag = 0; unsigned max_flag = 0;
int flags[4]; int32_t flags[4];
int vendor_shuffle[3]; int vendor_shuffle[3];
char vendor[13]; char vendor[13];
x86_cpuid(0, flags); x86_cpuid(0, flags);

52
menu/drivers/ozone.c
View File

@ -4592,7 +4592,7 @@ static void ozone_change_tab(ozone_handle_t *ozone,
menu_driver_deferred_push_content_list(selection_buf); menu_driver_deferred_push_content_list(selection_buf);
} }
static void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection) static void ozone_sidebar_goto(ozone_handle_t *ozone, size_t new_selection)
{ {
static const enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = { static const enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = {
MENU_ENUM_LABEL_MAIN_MENU, MENU_ENUM_LABEL_MAIN_MENU,
@ -8125,17 +8125,17 @@ static enum menu_action ozone_parse_menu_entry_action(
: ozone->categories_selection_ptr; : ozone->categories_selection_ptr;
new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size)); new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size));
while (new_selection == (int)tab_selection) while (new_selection == tab_selection)
new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size)); new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size));
if (new_selection != (int)tab_selection) if (new_selection != tab_selection)
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
new_action = MENU_ACTION_NOOP; new_action = MENU_ACTION_NOOP;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(true); audio_driver_mixer_play_scroll_sound(true);
#endif #endif
break; break;
@ -8231,16 +8231,16 @@ static enum menu_action ozone_parse_menu_entry_action(
? ozone_get_onscreen_category_selection(ozone) ? ozone_get_onscreen_category_selection(ozone)
: ozone->categories_selection_ptr; : ozone->categories_selection_ptr;
new_selection = (int)(selection + 1); new_selection = selection + 1;
if (new_selection >= (int)(ozone->system_tab_end + horizontal_list_size + 1)) if (new_selection >= ozone->system_tab_end + horizontal_list_size + 1)
new_selection = 0; new_selection = 0;
if ( !menu_navigation_wraparound_enable if ( !menu_navigation_wraparound_enable
&& selection == ozone->system_tab_end + horizontal_list_size) && selection == ozone->system_tab_end + horizontal_list_size)
new_selection = (int)selection; new_selection = selection;
if (new_selection != (int)selection) if (new_selection != selection)
{ {
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE; new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
@ -8253,7 +8253,7 @@ static enum menu_action ozone_parse_menu_entry_action(
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(false); audio_driver_mixer_play_scroll_sound(false);
#endif #endif
break; break;
@ -8288,7 +8288,7 @@ static enum menu_action ozone_parse_menu_entry_action(
&& selection == 0) && selection == 0)
new_selection = 0; new_selection = 0;
if (new_selection != (int)selection) if (new_selection != selection)
{ {
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE; new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
@ -8301,7 +8301,7 @@ static enum menu_action ozone_parse_menu_entry_action(
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(true); audio_driver_mixer_play_scroll_sound(true);
#endif #endif
break; break;
@ -8505,7 +8505,7 @@ static enum menu_action ozone_parse_menu_entry_action(
{ {
ozone->flags2 &= ~OZONE_FLAG2_PENDING_CURSOR_IN_SIDEBAR; ozone->flags2 &= ~OZONE_FLAG2_PENDING_CURSOR_IN_SIDEBAR;
ozone->flags |= OZONE_FLAG_CURSOR_IN_SIDEBAR; ozone->flags |= OZONE_FLAG_CURSOR_IN_SIDEBAR;
ozone_sidebar_goto(ozone, (unsigned)ozone->categories_selection_ptr); ozone_sidebar_goto(ozone, ozone->categories_selection_ptr);
} }
break; break;
case MENU_ACTION_SCROLL_UP: case MENU_ACTION_SCROLL_UP:
@ -8539,18 +8539,18 @@ static enum menu_action ozone_parse_menu_entry_action(
if (tab_selection < (size_t)(ozone->system_tab_end + 1)) if (tab_selection < (size_t)(ozone->system_tab_end + 1))
new_selection = 0; new_selection = 0;
else if ((int)tab_selection > (int)ozone->system_tab_end - new_selection else if (tab_selection > ozone->system_tab_end - new_selection
|| new_selection < 0) || new_selection < 0)
new_selection = (int)(ozone->system_tab_end + 1); new_selection = ozone->system_tab_end + 1;
if (new_selection != (int)tab_selection) if (new_selection != tab_selection)
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_NOOP; new_action = MENU_ACTION_NOOP;
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(true); audio_driver_mixer_play_scroll_sound(true);
#endif #endif
break; break;
@ -8602,17 +8602,17 @@ static enum menu_action ozone_parse_menu_entry_action(
new_selection = ozone->system_tab_end + 1; new_selection = ozone->system_tab_end + 1;
} }
if (new_selection > (int)(ozone->system_tab_end + horizontal_list_size)) if (new_selection > ozone->system_tab_end + horizontal_list_size)
new_selection = (int)(ozone->system_tab_end + horizontal_list_size); new_selection = ozone->system_tab_end + horizontal_list_size;
if (new_selection != (int)tab_selection) if (new_selection != tab_selection)
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_NOOP; new_action = MENU_ACTION_NOOP;
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(false); audio_driver_mixer_play_scroll_sound(false);
#endif #endif
break; break;
@ -8641,16 +8641,16 @@ static enum menu_action ozone_parse_menu_entry_action(
new_selection = 0; new_selection = 0;
if (tab_selection > ozone->system_tab_end) if (tab_selection > ozone->system_tab_end)
new_selection = (int)(ozone->system_tab_end + 1); new_selection = ozone->system_tab_end + 1;
if (new_selection != (int)tab_selection) if (new_selection != tab_selection)
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_NOOP; new_action = MENU_ACTION_NOOP;
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(true); audio_driver_mixer_play_scroll_sound(true);
#endif #endif
break; break;
@ -8667,14 +8667,14 @@ static enum menu_action ozone_parse_menu_entry_action(
new_selection = ozone->system_tab_end + horizontal_list_size; new_selection = ozone->system_tab_end + horizontal_list_size;
if (new_selection != (int)tab_selection) if (new_selection != tab_selection)
ozone_sidebar_goto(ozone, new_selection); ozone_sidebar_goto(ozone, new_selection);
new_action = MENU_ACTION_NOOP; new_action = MENU_ACTION_NOOP;
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE; ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
if (new_selection != (int)selection) if (new_selection != selection)
audio_driver_mixer_play_scroll_sound(false); audio_driver_mixer_play_scroll_sound(false);
#endif #endif
break; break;
@ -12803,7 +12803,7 @@ static int ozone_pointer_up(void *userdata,
/* Ensure that current category is valid */ /* Ensure that current category is valid */
if (ozone->pointer_categories_selection <= ozone->system_tab_end + horizontal_list_size) if (ozone->pointer_categories_selection <= ozone->system_tab_end + horizontal_list_size)
ozone_sidebar_goto(ozone, (unsigned)ozone->pointer_categories_selection); ozone_sidebar_goto(ozone, ozone->pointer_categories_selection);
} }
} }
break; break;