Skip to content

Commit 9cedc4a

Browse files
committed
Update to v1.21.0
1 parent cb4499c commit 9cedc4a

5 files changed

Lines changed: 47 additions & 41 deletions

patches/00001_initial_commit_by_eggs.patch

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,31 @@ index 543fe5b630..4a0e4ffd78 100644
221221
};
222222
+#endif
223223
diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
224-
index 770981d9c1..cbbd0908f7 100644
224+
index 5f2ab2405a..35f01e7dae 100644
225225
--- a/libretro-common/audio/conversion/float_to_s16.c
226226
+++ b/libretro-common/audio/conversion/float_to_s16.c
227-
@@ -32,12 +32,11 @@
227+
@@ -32,11 +32,10 @@
228228
#include <audio/conversion/float_to_s16.h>
229-
229+
230230
#if (defined(__ARM_NEON__) || defined(HAVE_NEON))
231231
+#include <arm_neon.h>
232232
static bool float_to_s16_neon_enabled = false;
233233
#ifdef HAVE_ARM_NEON_ASM_OPTIMIZATIONS
234-
void convert_float_s16_asm(int16_t *out,
235-
const float *in, size_t samples);
234+
void convert_float_s16_asm(int16_t *s, const float *in, size_t len);
236235
-#else
237236
-#include <arm_neon.h>
238237
#endif
239-
240-
void convert_float_to_s16(int16_t *out,
238+
239+
void convert_float_to_s16(int16_t *s, const float *in, size_t len)
240+
@@ -55,7 +54,7 @@ void convert_float_to_s16(int16_t *s, const float *in, size_t len)
241+
242+
s += aligned_samples;
243+
in += aligned_samples;
244+
- samples -= aligned_samples;
245+
+ len -= aligned_samples;
246+
i = 0;
247+
#else
248+
int16x4x2_t oreg;
241249
diff --git a/retroarch.c b/retroarch.c
242250
index d28825d383..6bb120bd89 100644
243251
--- a/retroarch.c
Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
diff --git a/tasks/task_save.c b/tasks/task_save.c
2-
index 636feebd6f..c6391d13a3 100644
2+
index 0f867f38d0..ae6d252fa6 100644
33
--- a/tasks/task_save.c
44
+++ b/tasks/task_save.c
5-
@@ -1057,10 +1057,10 @@ static void task_load_handler(retro_task_t *task)
6-
7-
if (state->flags & SAVE_TASK_FLAG_AUTOLOAD)
8-
{
9-
- snprintf(msg,
10-
- msg_size - 1,
5+
@@ -793,11 +793,7 @@ static void task_load_handler(retro_task_t *task)
6+
{
7+
char msg[128];
8+
9+
- if (state->flags & SAVE_TASK_FLAG_AUTOLOAD)
10+
- snprintf(msg, sizeof(msg),
1111
- msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_SUCCEEDED),
1212
- path_basename(state->path));
13-
+ // snprintf(msg,
14-
+ // msg_size - 1,
15-
+ // msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_SUCCEEDED),
16-
+ // path_basename(state->path));
17-
}
18-
else
13+
- else
14+
+ if (!(state->flags & SAVE_TASK_FLAG_AUTOLOAD))
1915
{
20-
@@ -1074,7 +1074,6 @@ static void task_load_handler(retro_task_t *task)
16+
if (state->state_slot < 0)
17+
strlcpy(msg,
18+
@@ -807,9 +803,8 @@ static void task_load_handler(retro_task_t *task)
19+
snprintf(msg, sizeof(msg),
20+
msg_hash_to_str(MSG_LOADED_STATE_FROM_SLOT),
2121
state->state_slot);
22+
+ task_set_title(task, strdup(msg));
2223
}
23-
24+
-
2425
- task_set_title(task, strdup(msg));
25-
free(msg);
2626
}
27-
27+
28+
goto end;

patches/00007_goweiwen_add_state_disk_slot_commands.patch

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ index ad3ac3e12eb..416f98062f6 100644
165165

166166
static const struct cmd_map map[] = {
167167
diff --git a/runloop.c b/runloop.c
168-
index 846fbabcd3a..bd8bc2adecf 100644
168+
index a4bc004f26..669737e7ab 100644
169169
--- a/runloop.c
170170
+++ b/runloop.c
171-
@@ -7195,6 +7195,18 @@ void runloop_task_msg_queue_push(
171+
@@ -7361,6 +7361,17 @@ void runloop_task_msg_queue_push(
172+
runloop_msg_queue_push(msg, prio, duration, flush, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
172173
}
173-
174-
174+
175175
+uint32_t runloop_get_current_savestate()
176176
+{
177177
+ settings_t *settings = config_get_ptr();
@@ -183,10 +183,9 @@ index 846fbabcd3a..bd8bc2adecf 100644
183183
+ settings_t *settings = config_get_ptr();
184184
+ settings->ints.state_slot = state_slot;
185185
+}
186-
+
186+
187187
bool runloop_get_current_savestate_path(char *path, size_t len)
188188
{
189-
settings_t *settings = config_get_ptr();
190189
diff --git a/runloop.h b/runloop.h
191190
index 3ba255f7ba9..b0f2d5f567b 100644
192191
--- a/runloop.h

patches/00009_goweiwen_retain_fast-forward_state_when_pausing.patch

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,27 @@ Subject: [PATCH] feat: retain fast-forward state when pausing
88
1 file changed, 8 insertions(+), 8 deletions(-)
99

1010
diff --git a/runloop.c b/runloop.c
11-
index bd8bc2adecf..27f2c8b8048 100644
11+
index 55313076f0..d264d5989f 100644
1212
--- a/runloop.c
1313
+++ b/runloop.c
14-
@@ -6210,14 +6210,14 @@ static enum runloop_state_enum runloop_check_state(
14+
@@ -6476,13 +6476,13 @@ static enum runloop_state_enum runloop_check_state(
1515
if (!check2)
1616
check2 = old_hold_button_state != new_hold_button_state;
17-
17+
1818
- /* Don't allow fastmotion while paused */
19-
- if (runloop_paused)
19+
- if (check2 && runloop_paused)
2020
- {
21-
- check2 = true;
2221
- new_button_state = false;
2322
- new_hold_button_state = false;
2423
- input_st->flags |= INP_FLAG_NONBLOCKING;
2524
- }
2625
+ // /* Don't allow fastmotion while paused */
27-
+ // if (runloop_paused)
26+
+ // if (check2 && runloop_paused)
2827
+ // {
29-
+ // check2 = true;
3028
+ // new_button_state = false;
3129
+ // new_hold_button_state = false;
3230
+ // input_st->flags |= INP_FLAG_NONBLOCKING;
3331
+ // }
34-
35-
if (check2)
36-
{
32+
33+
#ifdef HAVE_NETWORKING
34+
if (check2 && !netplay_allow_timeskip)

submodules/RetroArch

Submodule RetroArch updated 631 files

0 commit comments

Comments
 (0)