Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ ifeq ($(PLATFORM),linux)
ECHO = echo -e
endif

SHELL := /bin/bash
.SHELLFLAGS := -eu -o pipefail -c

# Function to print status messages
print_status = $(ECHO) "\033[34m--- $1\033[0m"

Expand Down Expand Up @@ -82,5 +85,5 @@ build: $(BUILD_DIR)/retroarch $(BUILD_DIR)/retroarch_miyoo354

clean:
@$(call print_status, Cleaning)
rm -rf $(BUILD_DIR)
rm -rf bin
rm -rf $(BUILD_DIR) || true
rm -rf bin || true
22 changes: 15 additions & 7 deletions patches/00001_initial_commit_by_eggs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -221,23 +221,31 @@ index 543fe5b630..4a0e4ffd78 100644
};
+#endif
diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
index 770981d9c1..cbbd0908f7 100644
index 5f2ab2405a..35f01e7dae 100644
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ b/libretro-common/audio/conversion/float_to_s16.c
@@ -32,12 +32,11 @@
@@ -32,11 +32,10 @@
#include <audio/conversion/float_to_s16.h>

#if (defined(__ARM_NEON__) || defined(HAVE_NEON))
+#include <arm_neon.h>
static bool float_to_s16_neon_enabled = false;
#ifdef HAVE_ARM_NEON_ASM_OPTIMIZATIONS
void convert_float_s16_asm(int16_t *out,
const float *in, size_t samples);
void convert_float_s16_asm(int16_t *s, const float *in, size_t len);
-#else
-#include <arm_neon.h>
#endif

void convert_float_to_s16(int16_t *out,

void convert_float_to_s16(int16_t *s, const float *in, size_t len)
@@ -55,7 +54,7 @@ void convert_float_to_s16(int16_t *s, const float *in, size_t len)

s += aligned_samples;
in += aligned_samples;
- samples -= aligned_samples;
+ len -= aligned_samples;
i = 0;
#else
int16x4x2_t oreg;
diff --git a/retroarch.c b/retroarch.c
index d28825d383..6bb120bd89 100644
--- a/retroarch.c
Expand Down
35 changes: 18 additions & 17 deletions patches/00003_hide_autoload_message.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 636feebd6f..c6391d13a3 100644
index 0f867f38d0..ae6d252fa6 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -1057,10 +1057,10 @@ static void task_load_handler(retro_task_t *task)

if (state->flags & SAVE_TASK_FLAG_AUTOLOAD)
{
- snprintf(msg,
- msg_size - 1,
@@ -793,11 +793,7 @@ static void task_load_handler(retro_task_t *task)
{
char msg[128];

- if (state->flags & SAVE_TASK_FLAG_AUTOLOAD)
- snprintf(msg, sizeof(msg),
- msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_SUCCEEDED),
- path_basename(state->path));
+ // snprintf(msg,
+ // msg_size - 1,
+ // msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_SUCCEEDED),
+ // path_basename(state->path));
}
else
- else
+ if (!(state->flags & SAVE_TASK_FLAG_AUTOLOAD))
{
@@ -1074,7 +1074,6 @@ static void task_load_handler(retro_task_t *task)
if (state->state_slot < 0)
strlcpy(msg,
@@ -807,9 +803,8 @@ static void task_load_handler(retro_task_t *task)
snprintf(msg, sizeof(msg),
msg_hash_to_str(MSG_LOADED_STATE_FROM_SLOT),
state->state_slot);
+ task_set_title(task, strdup(msg));
}
-
- task_set_title(task, strdup(msg));
free(msg);
}


goto end;
31 changes: 13 additions & 18 deletions patches/00007_goweiwen_add_state_disk_slot_commands.patch
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ index 1f07bdd4eeb..b64f63f08d9 100644
bool command_load_state_slot(command_t *cmd, const char *arg)
{
diff --git a/command.h b/command.h
index ad3ac3e12eb..416f98062f6 100644
index 6fd256541b..7e9c378af4 100644
--- a/command.h
+++ b/command.h
@@ -408,6 +408,12 @@ bool command_version(command_t *cmd, const char* arg);
@@ -426,6 +426,12 @@ bool command_version(command_t *cmd, const char* arg);
bool command_get_status(command_t *cmd, const char* arg);
bool command_get_config_param(command_t *cmd, const char* arg);
bool command_show_osd_msg(command_t *cmd, const char* arg);
Expand All @@ -145,33 +145,29 @@ index ad3ac3e12eb..416f98062f6 100644
+bool command_save_state_slot(command_t *cmd, const char *arg);
bool command_load_state_slot(command_t *cmd, const char* arg);
bool command_play_replay_slot(command_t *cmd, const char* arg);
#ifdef HAVE_CHEEVOS
@@ -441,8 +447,15 @@ static const struct cmd_action_map action_map[] = {
bool command_seek_replay(command_t *cmd, const char *arg);
@@ -456,6 +462,13 @@ static const struct cmd_action_map action_map[] = {
{ "READ_CORE_MEMORY", command_read_memory, "<address> <number of bytes>" },
{ "WRITE_CORE_MEMORY",command_write_memory, "<address> <byte1> <byte2> ..." },

- { "LOAD_STATE_SLOT",command_load_state_slot, "<slot number>"},
- { "PLAY_REPLAY_SLOT",command_play_replay_slot, "<slot number>"},

+ { "GET_DISK_COUNT", command_get_disk_count, "No argument" },
+ { "GET_DISK_SLOT", command_get_disk_slot, "No argument" },
+ { "SET_DISK_SLOT", command_set_disk_slot, "<disc number>" },
+
+ { "GET_STATE_SLOT", command_get_state_slot, "No argument" },
+ { "SET_STATE_SLOT", command_set_state_slot, "<slot number>" },
+ { "SAVE_STATE_SLOT", command_save_state_slot, "<slot number>" },
+ { "LOAD_STATE_SLOT", command_load_state_slot, "<slot number>" },
+ { "PLAY_REPLAY_SLOT", command_play_replay_slot, "<slot number>" },
};

static const struct cmd_map map[] = {
{ "LOAD_STATE_SLOT",command_load_state_slot, "<slot number>"},
{ "PLAY_REPLAY_SLOT",command_play_replay_slot, "<slot number>"},
{ "SEEK_REPLAY",command_seek_replay, "<frame number>"},
diff --git a/runloop.c b/runloop.c
index 846fbabcd3a..bd8bc2adecf 100644
index a4bc004f26..669737e7ab 100644
--- a/runloop.c
+++ b/runloop.c
@@ -7195,6 +7195,18 @@ void runloop_task_msg_queue_push(
@@ -7361,6 +7361,17 @@ void runloop_task_msg_queue_push(
runloop_msg_queue_push(msg, prio, duration, flush, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}



+uint32_t runloop_get_current_savestate()
+{
+ settings_t *settings = config_get_ptr();
Expand All @@ -183,10 +179,9 @@ index 846fbabcd3a..bd8bc2adecf 100644
+ settings_t *settings = config_get_ptr();
+ settings->ints.state_slot = state_slot;
+}
+

bool runloop_get_current_savestate_path(char *path, size_t len)
{
settings_t *settings = config_get_ptr();
diff --git a/runloop.h b/runloop.h
index 3ba255f7ba9..b0f2d5f567b 100644
--- a/runloop.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,27 @@ Subject: [PATCH] feat: retain fast-forward state when pausing
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/runloop.c b/runloop.c
index bd8bc2adecf..27f2c8b8048 100644
index 55313076f0..d264d5989f 100644
--- a/runloop.c
+++ b/runloop.c
@@ -6210,14 +6210,14 @@ static enum runloop_state_enum runloop_check_state(
@@ -6476,13 +6476,13 @@ static enum runloop_state_enum runloop_check_state(
if (!check2)
check2 = old_hold_button_state != new_hold_button_state;

- /* Don't allow fastmotion while paused */
- if (runloop_paused)
- if (check2 && runloop_paused)
- {
- check2 = true;
- new_button_state = false;
- new_hold_button_state = false;
- input_st->flags |= INP_FLAG_NONBLOCKING;
- }
+ // /* Don't allow fastmotion while paused */
+ // if (runloop_paused)
+ // if (check2 && runloop_paused)
+ // {
+ // check2 = true;
+ // new_button_state = false;
+ // new_hold_button_state = false;
+ // input_st->flags |= INP_FLAG_NONBLOCKING;
+ // }
if (check2)
{

#ifdef HAVE_NETWORKING
if (check2 && !netplay_allow_timeskip)
2 changes: 1 addition & 1 deletion src/input/drivers_joypad/sdl_miyoomini_joypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static void sdl_miyoomini_joypad_connect(void) {
/* 'Register' joypad connection via autoconfig task */
input_autoconfigure_connect(
sdl_miyoomini_joypad_name(0), /* name */
NULL, /* display_name */
NULL, NULL, /* display_names */
sdl_dingux_joypad.ident, /* driver */
0, /* port */
0, /* vid */
Expand Down
2 changes: 1 addition & 1 deletion submodules/RetroArch
Submodule RetroArch updated 1188 files