Merge remote-tracking branch 'upstream/master' into next

Author: ethanaobrien

.dir-locals.el

@@ -2,9 +2,12 @@
 ;;; See Info node `(emacs) Directory Variables' for more information.
 
 (
- (c-mode . ((c-basic-offset . 3)
+ (c-mode . ((standard-indent . 3)
+            (c-basic-offset . 3)
             (c-file-offsets . ((arglist-intro . ++)
-                               (arglist-cont-nonempty . ++)))
+                               (arglist-cont-nonempty . ++)
+                               (block-close . 0)
+                               (block-open . 0)))
             (eval . (setq-local c-cleanup-list
                                 (cl-set-difference c-cleanup-list
                                                    '(brace-else-brace

CHANGES.md

@@ -1,17 +1,25 @@
 # Future
+- ANDROID: OnNewIntent handler to allow launchers start new content without closing first
 - APPLE: Include sameduck, gearcoleco, geargrafx cores in App Store builds
 - APPLE: Include reminiscence, virtualjaguar, vitaquake2 cores in App Store builds
+- APPLE: Include gam4980 core in App Store builds
 - APPLE: Bundle identifier added to Information menu
 - APPLE: Option to control the usage of Metal argument buffers
 - APPLE: Don't force fullscreen, allow multitasking on iPad
+- APPLE: AppIntents for Siri, Shortcuts
+- APPLE: Fix ffmpeg camera driver
 - AUDIO: Microphone CoreAudio driver for iOS and macOS
+- AUTOCONF: Autoconfig match extended with a physical identifier
 - CAMERA: Use ffmpeg libavfilter virtual input device as default
 - CHEEVOS: Show additional message for unsupported achievements
+- CHEEVOS: Upgrade to rcheevos 12.0
+- DATABASE: Filter in Database Manager now works for genre and region
 - CLOUDSYNC: Enable icloud_drive cloud sync backend on MacOS / iOS
 - CLOUDSYNC: Don't always trust the server hash
 - CLOUDSYNC: Enable WebDAV support for Android
 - CLOUDSYNC: Speed up cloudsync on Apple
 - DATABASE: Improve multidisk game scanning
+- EMSCRIPTEN: Support core switching
 - EMSCRIPTEN: Support suspend screensaver
 - EMSCRIPTEN/RWEBCAM: Fix camera driver
 - EMSCRIPTEN/RWEBINPUT: Add accelerometer/gyroscope support
@@ -23,10 +31,23 @@
 - INPUT: Fix menu usage when OK/Cancel has mouse binds
 - INPUT: Ignore menu mouse startup position before moving
 - INPUT: Fix heavy slowdown when using Bluetooth XInput controllers with rumble
+- INPUT: Reset and close content hotkeys now require confirmation, similar to quit
+- INPUT: Menu toggle and hotkey enable can now be assigned to the same key
+- INPUT/ANDROID: Favor mouse coordinates for lightgun
 - INPUT/UDEV: Fix lost terminal settings after restart from menu
+- INPUT/BSV/REPLAY: Bumped replay format version to 2. Old replays will still play back fine.
+- INPUT/BSV/REPLAY: Add option to skip deserializing checkpoints from replay files (it introduces jank in some emulators).
+- INPUT/BSV/REPLAY: Add checkpoint and initial savestate compression, following the `savestate_file_compression` config boolean.  Use zstd if available, or fall back to zlib.
+- INPUT/BSV/REPLAY: Add incremental checkpoints based on statestreams (depending on `HAVE_STATESTREAM` compile time flag).  As an example, 60 `pcsx_rearmed` savestates would take 267MB uncompressed; with incremental encoding this is reduced to 77MB.  Compressing the result can reduce the size to just 4MB.
+- INPUT/BSV/REPLAY: Checkpoint compression and encoding can be combined. For example, 60 `pcsx_rearmed` checkpoints can take up just 15MB if each state is incremental and compressed. This is not as optimal as using incremental states without save state compression followed by offline compression, but is a good compromise in many use cases.
+- INPUT/BSV/REPLAY: Add hotkeys and text commands to force a checkpoint insertion into the currently recording replay, and to seek backwards to the previous checkpoint and forwards to the next checkpoint.
+- INPUT/BSV/REPLAY: Add a text command to seek to a specific frame of the currently playing/recording replay; it will return via the command replier the actual seeked-to frame (right now it only supports seeking to checkpoints).
 - INTL: Add Irish Gaelic to selectable languages
 - IOS: Fix crash on iOS9 when fetching refresh rate
+- LIBRETRO: Deprecate intfstream_open_writable_memory
+- LIBRETRO: New environment function RETRO_ENVIRONMENT_GET_TARGET_SAMPLE_RATE
 - LINUX: Add full complement of key/value pairs to desktop entry
+- MACOS: Fix coreaudio microphone handling
 - MENU: Common Thumbnail Background option for all menu drivers
 - MENU: Move core options reset from Settings/Configuration to Main Menu / Configuration Files
 - MENU: Use right analog stick for thumbnail cycling in playlists
@@ -40,27 +61,45 @@
 - MENU: Unwanted input is prevented when menu is triggered by toggle combo
 - MENU: 32-bit values in cheats and rumble are not presented as huge lists
 - MENU: Less important widgets are now sized like task notifications
+- MENU: Play count is added to runtime log
+- MENU: Configurable startup page (several options beside default Main Menu)
+- MENU: Shader menu rework, combined save/remove menus, save current, Y and Start hotkeys for shader parameters and background opacity toggle
+- MENU: Single-click start option from playlists and Explore view
+- MENU: Allow kiosk mode and hiding of Settings menu also in GLUI and RGUI
+- MENU: Task widget improvements
+- MENU/GLUI: Show thumbnails in Explore view
 - MENU/XMB: Select button toggles thumbnails in playlists
 - MENU/XMB,OZONE: Fix content icons when playlist tabs are hidden
 - MENU/OZONE: Horizontal padding factor option
 - MENU/OZONE: Custom font selection and scaling factor
+- MENU/RGUI: Clock format is now configurable and moved to top header
 - NETWORK: Fixes for nmcli wifi driver
 - NETWORK: Network command interface enabled for Android, iOS, TVOS
 - OTHER: ZStandard support and libchdr update for support of chd files converted with createdvd option
 - OVERLAY: Speed limit on touch pointer tracking
+- OVERLAY: Dedicate each touch pointer to hitboxes or pointing devices
 - PLAYLIST: Built-in playlists are now stored under playlists/builtin
 - PLAYLIST: Fix subsystem information in playlists
+- PS3: Fix psl1ght target of dist-cores.sh
 - REPLAY: Bugs fixed regarding rewind
 - REPLAY: Same timeline check and future state check for replays vs. savestates
 - SAVESTATES: Savestate thumbnails are default enabled for x86_64 builds
+- SAVESTATES: Slot is now remembered using the runtime log file
+- SAVESTATES: Slot hotkey widget shows save state thumbnail
 - VIDEO: Fix auto swap interval setup
 - VIDEO: Improvements for integer scale half scaling
 - VIDEO: Frame delay improvements for the automatic setting
+- VIDEO: Auto-enable GPU recording with HW context cores
+- VIDEO: Fix viewport bias when using custom aspect ratio
 - VIDEO/D3D11/D3D12: snappy extra vsync presentation mode
+- VIDEO/GL: Fallback OpenGL symbol loader for Linux devices with EGL < 1.5
+- VIDEO/GL: Support for Cg and GLSL shaders in the GLCore video driver
 - VIDEO/SHADER: Shader hold function, useful for some lightguns and shader comparison
 - VIDEO/SWITCHRES: Horizontal and vertical geometry adjustment options added
 - VIDEO/SWITCHRES: Game overrides
 - VIDEO/WAYLAND: Support for xdg-toplevel-icon-v1
+- VIDEO/WAYLAND: Fix deadlock when using Wayland Vulkan driver
+- VITA: Touchscreen support for PS Vita
 - WEBOS: Various fixes and tunings
 - WEBOS: Disable core dumps
 - WEBOS: Debug builds enabled

Makefile

@@ -1,4 +1,5 @@
 HAVE_FILE_LOGGER=1
+HAVE_STATESTREAM?=1
 NEED_CXX_LINKER?=0
 NEED_GOLD_LINKER?=0
 MISSING_DECLS   =0

Makefile.common

@@ -451,6 +451,12 @@ endif
 
 ifeq ($(HAVE_BSV_MOVIE), 1)
    DEFINES += -DHAVE_BSV_MOVIE
+   OBJ += input/bsv/bsvmovie.o
+endif
+
+ifeq ($(HAVE_STATESTREAM), 1)
+   DEFINES += -DHAVE_STATESTREAM
+   OBJ += input/bsv/uint32s_index.o
 endif
 
 ifeq ($(HAVE_RUNAHEAD), 1)

Makefile.ctr

@@ -68,6 +68,14 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	#DEFINES += -DHAVE_SOCKET_LEGACY
 	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
+	CFLAGS += -I. \
+		-Ideps \
+		-Ideps/7zip \
+		-Ideps/stb \
+		-Ideps/mbedtls \
+		-Ideps/rcheevos/include \
+		-Ilibretro-common/include \
+		-Ilibretro-common/include/compat/zlib
 else
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
@@ -104,7 +112,7 @@ else
 	HAVE_CLOUDSYNC = 1
 
 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
+	CFLAGS += $(DEF_FLAGS) -I. $(INCLUDE_DIRS)
 endif
 
 ifeq ($(strip $(DEVKITPRO)),)
@@ -180,14 +188,6 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-CFLAGS += -I. \
-	  -Ideps \
-	  -Ideps/7zip \
-	  -Ideps/stb \
-	  -Ideps/mbedtls \
-	  -Ideps/rcheevos/include \
-	  -Ilibretro-common/include \
-	  -Ilibretro-common/include/compat/zlib
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)

Makefile.emscripten

@@ -14,6 +14,7 @@ OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -DEMSCRIPTEN
 DEFINES += -DHAVE_FILTERS_BUILTIN -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORE_INFO
 
+HAVE_STATESTREAM ?= 1
 HAVE_PATCH = 1
 HAVE_DSP_FILTER = 1
 HAVE_VIDEO_FILTER = 1
@@ -161,7 +162,7 @@ ifeq ($(HAVE_SDL2), 1)
 endif
 
 LDFLAGS := -L. --no-heap-copy -s STACK_SIZE=$(STACK_SIZE) -s INITIAL_MEMORY=$(INITIAL_HEAP) \
-           -s EXPORTED_RUNTIME_METHODS=$(EXPORTS) \
+           -s EXPORTED_RUNTIME_METHODS=$(EXPORTS) -s EXIT_RUNTIME=1 \
            -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS="$(EXPORTED_FUNCTIONS)" \
            -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME="libretro_$(subst -,_,$(LIBRETRO))" \
            -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 \

audio/audio_driver.c

@@ -231,7 +231,7 @@ microphone_driver_t *microphone_drivers[] = {
 #ifdef HAVE_PIPEWIRE
       &microphone_pipewire,
 #endif
-#if defined(HAVE_COREAUDIO) && IOS
+#if defined(HAVE_COREAUDIO)
       &microphone_coreaudio,
 #endif
       &microphone_null,

audio/common/mmdevice_common.c

@@ -24,7 +24,7 @@
 
 #include "../../verbosity.h"
 
-static const char* mmdevice_data_flow_name(unsigned data_flow)
+static const char *mmdevice_data_flow_name(unsigned data_flow)
 {
    switch (data_flow)
    {

audio/drivers/alsathread.c

@@ -214,9 +214,10 @@ static void alsa_microphone_worker_thread(void *mic_context)
 
 static int alsa_thread_microphone_read(void *driver_context, void *mic_context, void *s, size_t len)
 {
+   snd_pcm_state_t state;
+   size_t _len = 0;
    alsa_thread_microphone_t       *alsa = (alsa_thread_microphone_t*)driver_context;
    alsa_thread_microphone_handle_t *mic = (alsa_thread_microphone_handle_t*)mic_context;
-   snd_pcm_state_t state;
 
    if (!alsa || !mic || !s) /* If any of the parameters were invalid... */
       return -1;
@@ -245,28 +246,23 @@ static int alsa_thread_microphone_read(void *driver_context, void *mic_context,
    if (alsa->nonblock)
    {
       size_t avail;
-      size_t write_amt;
 
       /* "Hey, I'm gonna borrow the queue." */
       slock_lock(mic->info.fifo_lock);
 
       avail           = FIFO_READ_AVAIL(mic->info.buffer);
-      write_amt       = MIN(avail, len);
+      _len            = MIN(avail, len);
 
       /* "It's okay if you don't have any new samples, I'll just check in on you later." */
-      fifo_read(mic->info.buffer, s, write_amt);
+      fifo_read(mic->info.buffer, s, _len);
 
       /* "Here, take this queue back." */
       slock_unlock(mic->info.fifo_lock);
-
-      return (int)write_amt;
    }
    else
    {
-      size_t read = 0;
-
       /* Until we've read all requested samples (or we're told to stop)... */
-      while (read < len && !mic->info.thread_dead)
+      while (_len < len && !mic->info.thread_dead)
       {
          size_t avail;
 
@@ -294,21 +290,20 @@ static int alsa_thread_microphone_read(void *driver_context, void *mic_context,
          }
          else
          {
-            size_t read_amt = MIN(len - read, avail);
+            size_t read_amt = MIN(len - _len, avail);
 
             /* "I'll just go ahead and consume all these samples..."
              * (As many as will fit in s, or as many as are available.) */
-            fifo_read(mic->info.buffer,s + read, read_amt);
+            fifo_read(mic->info.buffer,s + _len, read_amt);
 
             /* "I'm done, you can take the queue back now." */
             slock_unlock(mic->info.fifo_lock);
-            read += read_amt;
+            _len += read_amt;
          }
-
          /* "I'll be right back..." */
       }
-      return (int)read;
    }
+   return _len;
 }
 
 static bool alsa_thread_microphone_mic_alive(const void *driver_context, const void *mic_context);
@@ -475,8 +470,9 @@ static void alsa_worker_thread(void *data)
 
       frames = snd_pcm_writei(alsa->info.pcm, buf, alsa->info.stream_info.period_frames);
 
-      if (frames == -EPIPE || frames == -EINTR ||
-            frames == -ESTRPIPE)
+      if (     frames == -EPIPE
+            || frames == -EINTR
+            || frames == -ESTRPIPE)
       {
          if (snd_pcm_recover(alsa->info.pcm, frames, false) < 0)
          {
@@ -625,7 +621,6 @@ static bool alsa_thread_alive(void *data)
 static bool alsa_thread_stop(void *data)
 {
    alsa_thread_t *alsa = (alsa_thread_t*)data;
-
    if (alsa)
       alsa->is_paused = true;
    return true;

audio/drivers/audioio.c

@@ -36,26 +36,26 @@ static void *audioio_init(const char *device, unsigned rate, unsigned latency,
       unsigned block_frames, unsigned *new_out_rate)
 {
    struct audio_info info;
-   const char *audiodev = device ? device : DEFAULT_DEV;
-   int              *fd = (int*)calloc(1, sizeof(int));
+   const char *audiodev  = device ? device : DEFAULT_DEV;
+   int              *fd  = (int*)calloc(1, sizeof(int));
 
    if (!fd)
       return NULL;
 
    AUDIO_INITINFO(&info);
 
 #ifdef AUMODE_PLAY_ALL
-   info.mode = AUMODE_PLAY_ALL;
+   info.mode             = AUMODE_PLAY_ALL;
 #elif defined(AUMODE_PLAY)
-   info.mode = AUMODE_PLAY;
+   info.mode             = AUMODE_PLAY;
 #endif
    info.play.sample_rate = rate;
-   info.play.channels = 2;
-   info.play.precision = 16;
+   info.play.channels    = 2;
+   info.play.precision   = 16;
 #ifdef AUDIO_ENCODING_SLINEAR
-   info.play.encoding = AUDIO_ENCODING_SLINEAR;
+   info.play.encoding    = AUDIO_ENCODING_SLINEAR;
 #else
-   info.play.encoding = AUDIO_ENCODING_LINEAR;
+   info.play.encoding    = AUDIO_ENCODING_LINEAR;
 #endif
 
    if ((*fd = open(audiodev, O_WRONLY)) < 0)