Merge branch 'libretro:master' into master

Author: TheRhysWyrill

.github/workflows/webOS.yml

@@ -51,14 +51,14 @@ jobs:
         with:
           repository: "openlgtv/buildroot-nc4"
           latest: true
-          fileName: "linux-intel-webos-sdk.tar.gz"
+          fileName: "arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz"
           out-file-path: "/tmp"
 
       - name: Extract webOS NDK
         shell: bash
         working-directory: /tmp
         run: |
-          tar xzf linux-intel-webos-sdk.tar.gz
+          tar xzf arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz
           ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
 
       - name: Compile RA

.gitignore

@@ -263,3 +263,18 @@ param.sfo
 
 # Clazy
 *.clazy.yaml
+
+# PSL1GHT
+*.SELF
+EBOOT.BIN
+pkg/psl1ght/*.pkg
+modern_alpha_blend_fpo.h
+modern_alpha_blend_vpo.h
+modern_opaque_fpo.h
+modern_opaque_vpo.h
+gfx/drivers/rsx_shaders/modern_alpha_blend.fpo
+gfx/drivers/rsx_shaders/modern_alpha_blend.vpo
+gfx/drivers/rsx_shaders/modern_opaque.fpo
+gfx/drivers/rsx_shaders/modern_opaque.vpo
+pkg/psl1ght/pkg/USRDIR/shaders_cg/
+!pkg/psl1ght/pkg/USRDIR/system/

Makefile.common

@@ -1687,11 +1687,15 @@ ifeq ($(HAVE_VULKAN), 1)
 endif
 
 ifeq ($(HAVE_OPENGL_CORE), 1)
-   OBJ += gfx/drivers/gl3.o \
-	  gfx/drivers_shader/shader_gl3.o
+   OBJ += gfx/drivers/gl3.o
 
    DEFINES += -DHAVE_OPENGL_CORE
-   NEED_CXX_LINKER  = 1
+
+   ifeq ($(HAVE_SLANG), 1)
+      OBJ += gfx/drivers_shader/shader_gl3.o
+
+      NEED_CXX_LINKER = 1
+   endif
 endif
 
 ifeq ($(HAVE_OMAP), 1)

Makefile.webos

@@ -14,7 +14,8 @@ endif
 WEBOS_FREETYPE_CONFIG ?= $(STAGING_DIR)/usr/bin/freetype-config
 
 WEBOS_INC_DIR         ?= $(STAGING_DIR)/usr/include
-WEBOS_LIB_DIR         ?= $(STAGING_DIR)/usr/lib
+WEBOS_USR_LIB_DIR     ?= $(STAGING_DIR)/usr/lib
+WEBOS_LIB_DIR         ?= $(STAGING_DIR)/lib
 
 ADD_SDL2_LIB          ?= 0
 SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.12-webos.1/SDL2-2.30.12-webos-abi.tar.gz
@@ -145,7 +146,7 @@ CXXFLAGS := $(ARCHFLAGS) -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_
 ASFLAGS := $(ARCHFLAGS)
 LDFLAGS := -Wl,-rpath=\$$ORIGIN/lib,--gc-sections
 INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
-LIBRARY_DIRS = -L$(WEBOS_LIB_DIR)
+LIBRARY_DIRS = -L$(WEBOS_USR_LIB_DIR)
 DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
 DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -D_GNU_SOURCE
 DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
@@ -285,7 +286,8 @@ ipk: $(TARGET) sdl2
 	mkdir -p webos/dist/lib
 	echo "$$APPINFO" > webos/dist/appinfo.json
 	cp -t webos/dist -vf $(TARGET) webos/icon160.png
-	cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6
+	cp -t webos/dist/lib -vf $(WEBOS_USR_LIB_DIR)/libstdc++.so.6
+	cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libatomic.so.1
 ifeq ($(ADD_SDL2_LIB), 1)
 	cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
 endif

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,
@@ -483,9 +483,9 @@ static void audio_driver_flush(audio_driver_state_t *audio_st,
       dsp_data.output_frames         = 0;
 
       /* Initialize the DSP input/output.
-       * Our DSP implementations generally operate directly on the 
+       * Our DSP implementations generally operate directly on the
        * input buffer, so the output/output_frames attributes here are zero;
-       * the DSP filter will set them to useful values, most likely to be 
+       * the DSP filter will set them to useful values, most likely to be
        * the same as the inputs. */
 
       retro_dsp_filter_process(audio_st->dsp, &dsp_data);
@@ -565,7 +565,7 @@ static void audio_driver_flush(audio_driver_state_t *audio_st,
          audio_st->avg_flush_delta = audio_st->avg_flush_delta * (n - 1) / n +
             (flush_time - audio_st->last_flush_time) / n;
 
-         /* How much does the avg_flush_delta deviate 
+         /* How much does the avg_flush_delta deviate
           * from the delta at 1.0x speed? */
          src_data.ratio *=
             MAX(AUDIO_MIN_RATIO,
@@ -598,7 +598,7 @@ static void audio_driver_flush(audio_driver_state_t *audio_st,
 #endif
 
    /* Now we write our processed audio output to the driver.
-    * It may not be played immediately, depending on 
+    * It may not be played immediately, depending on
     * the driver implementation. */
    {
       const void *output_data = audio_st->output_samples_buf;
@@ -686,14 +686,14 @@ bool audio_driver_init_internal(void *settings_data, bool audio_cb_inited)
    audio_driver_st.output_samples_conv_buf_length = outsamples_max * sizeof(int16_t);
    audio_driver_st.chunk_block_size               = AUDIO_CHUNK_SIZE_BLOCKING;
    audio_driver_st.chunk_nonblock_size            = AUDIO_CHUNK_SIZE_NONBLOCKING;
-   audio_driver_st.chunk_size                     = audio_driver_st.chunk_block_size;
+   audio_driver_st.chunk_size                     = AUDIO_CHUNK_SIZE_BLOCKING;
 
    if (!audio_enable)
    {
       audio_driver_st.flags     &= ~AUDIO_FLAG_ACTIVE;
       return false;
    }
-   
+
    audio_driver_st.flags     |= AUDIO_FLAG_ACTIVE;
 
    if (!(audio_driver_find_driver(settings->arrays.audio_driver,
@@ -929,7 +929,7 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
    {
       size_t frames_to_write =
             (frames_remaining > (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1))
-                  ? (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1) 
+                  ? (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1)
                   : frames_remaining;
 
       if (recording_push_audio)
@@ -1996,7 +1996,7 @@ bool microphone_driver_start(void)
 
    /* If there's an opened microphone that the core turned on... */
    if (microphone->flags & MICROPHONE_FLAG_ACTIVE)
-   { 
+   {
       /* If this microphone was requested before the driver was ready...*/
       if (microphone->flags & MICROPHONE_FLAG_PENDING)
       {
@@ -2035,7 +2035,7 @@ bool microphone_driver_stop(void)
    microphone_driver_state_t *mic_st = &mic_driver_st;
    retro_microphone_t    *microphone = &mic_st->microphone;
 
-   /* If there's an opened microphone that the core 
+   /* If there's an opened microphone that the core
     * turned on and received... */
    if (      (microphone->flags & MICROPHONE_FLAG_ACTIVE)
          &&  (microphone->flags & MICROPHONE_FLAG_ENABLED)

audio/audio_thread_wrapper.c

@@ -251,23 +251,19 @@ static bool audio_thread_use_float(void *data)
 
 static ssize_t audio_thread_write(void *data, const void *s, size_t len)
 {
-   ssize_t ret;
+   ssize_t _len;
    audio_thread_t *thr = (audio_thread_t*)data;
-
    if (!thr)
       return 0;
-
-   ret = thr->driver->write(thr->driver_data, s, len);
-
-   if (ret < 0)
+   _len = thr->driver->write(thr->driver_data, s, len);
+   if (_len < 0)
    {
       slock_lock(thr->lock);
       thr->alive = false;
       scond_signal(thr->cond);
       slock_unlock(thr->lock);
    }
-
-   return ret;
+   return _len;
 }
 
 static const audio_driver_t audio_thread = {