Merge pull request #2182 from anthonycaccese/dev

RPCS3 Updates
2023-10-14 12:19:54 -04:00 · 2023-10-14 12:19:54 -04:00 · 59342d0ccd
commit 59342d0ccd
parent 8aedfbc4b4 b541d30457
10 changed files with 107 additions and 44 deletions
--- a/config/emulators/ps3.conf
+++ b/config/emulators/ps3.conf
@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Sony"
 SYSTEM_RELEASE="2006"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/ps3"
-SYSTEM_EXTENSION=".ps3 .bin"
+SYSTEM_EXTENSION=".ps3 .psn"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="ps3"
 SYSTEM_THEME="ps3"
--- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
@ -113,8 +113,8 @@ This document describes all available systems emulators and cores available for
 |SNK|Neo Geo Pocket Color (ngpc)|1999|`ngpc`|.ngc .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** beetle_psx (default)<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
 |Sony|PlayStation 2 (ps2)|2000|`ps2`|.iso .mdf .nrg .bin .img .dump .gz .cso .chd|**pcsx2:** pcsx2-sa (default)<br>**retroarch:** pcsx2<br>|
-|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .bin|**rpcs3:** rpcs3-sa (default)<br>|
-|Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp .chd|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
+|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .psn|**rpcs3:** rpcs3-sa (default)<br>|
+|Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sony|PlayStation Vita (psvita)|2011|`launcher`|.sh|**vita3k:** vita3k-sa (default)<br>|
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
--- a/packages/emulators/standalone/pcsx2-sa/sources/start_pcsx2.sh
+++ b/packages/emulators/standalone/pcsx2-sa/sources/start_pcsx2.sh
@ -15,6 +15,22 @@ then
  cp -rf /usr/config/PCSX2 /storage/.config
 fi

+#Create PS2 bios folder
+if [ ! -d "/storage/roms/bios/pcsx2/bios" ]
+then
+  mkdir -p "/storage/roms/bios/pcsx2/bios"
+fi
+
+#Create PS2 saves & savestates folders
+if [ ! -d "/storage/roms/saves/ps2" ]
+then
+  mkdir -p "/storage/roms/saves/ps2"
+fi
+if [ ! -d "/storage/roms/savestates/ps2" ]
+then
+  mkdir -p "/storage/roms/savestates/ps2"
+fi
+
 for OSDPROPERTY in OsdShowSpeed OsdShowFPS OsdShowCPU OsdShowGPU OsdShowResolution OsdShowGSStats OsdShowIndicators
 do
  case ${FPS} in
--- a/packages/emulators/standalone/rpcs3-sa/config/GuiConfigs/CurrentSettings.ini
+++ b/packages/emulators/standalone/rpcs3-sa/config/GuiConfigs/CurrentSettings.ini
@ -0,0 +1,17 @@
+[GameList]
+hidden_list=vsh.self
+
+[Localization]
+language=en
+
+[Meta]
+checkUpdateStart=false
+currentStylesheet=Kuroi (Dark) by Ani
+discordState=
+showDebugTab=false
+useRichPresence=false
+
+[main_window]
+confirmationBoxBootGame=false
+confirmationBoxExitGame=false
+infoBoxEnabledWelcome=false
--- a/packages/emulators/standalone/rpcs3-sa/config/rpcs3/config.yml
+++ b/packages/emulators/standalone/rpcs3-sa/config/rpcs3/config.yml
@ -64,7 +64,6 @@ Core:
  Performance Report Threshold: 500
  Enable Performance Report: false
  Assume External Debugger: false
-  SPU GETLLAR polling detection: false
 VFS:
  Enable /host_root/: false
  Initialize Directories: true
@ -73,7 +72,7 @@ VFS:
  Empty /dev_hdd0/tmp/: true
 Video:
  Renderer: Vulkan
-  Resolution: 720x480
+  Resolution: 1280x720
  Aspect ratio: 16:9
  Frame limit: Off
  Second Frame Limit: 0.000000
@ -124,16 +123,12 @@ Video:
  Disable MSL Fast Math: false
  Output Scaling Mode: Bilinear
  Vulkan:
-    Adapter: AMD Unknown (RADV RENOIR)
    Force FIFO present mode: false
    Force primitive restart flag: false
    Exclusive Fullscreen Mode: Automatic
    Asynchronous Texture Streaming 2: false
    FidelityFX CAS Sharpening Intensity: 50
    Asynchronous Queue Scheduler: Safe
-    Force Disable Exclusive Fullscreen Mode: false
-    Enable FidelityFX Super Resolution Upscaling: false
-    Metal Semaphore: MTLEvent preferred
  Performance Overlay:
    Enabled: false
    Enable Framerate Graph: false
@ -160,10 +155,6 @@ Video:
    Allow custom background: true
    Darkening effect strength: 30
    Blur effect strength: 0
-  Disable native float16 support: false
-  Shader Compilation Hint:
-    Position X (px): 20
-    Position Y (px): 690
 Audio:
  Renderer: Cubeb
  Audio Provider: CellAudio
@ -182,8 +173,6 @@ Audio:
  Microphone Type: "Null"
  Microphone Devices: "@@@@@@@@@@@@"
  Music Handler: Qt
-  Audio provider: CellAudio
-  Audio Channels: Downmix to Stereo
 Input/Output:
  Keyboard: Basic
  Mouse: Basic
@ -213,6 +202,7 @@ Net:
  Bind address: 0.0.0.0
  DNS address: 8.8.8.8
  IP swap list: ""
+  UPNP Enabled: false
  PSN status: Disconnected
 Savestate:
  Start Paused: false
@ -221,7 +211,7 @@ Savestate:
  Save Disc Game Data: false
 Miscellaneous:
  Automatically start games after boot: true
-  Exit RPCS3 when process finishes: false
+  Exit RPCS3 when process finishes: true
  Start games in fullscreen mode: true
  Prevent display sleep while running games: true
  Show trophy popups: true
@ -231,4 +221,4 @@ Miscellaneous:
  Silence All Logs: true
  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
  Pause Emulation During Home Menu: false
-Log: {}
+Log: {}
--- a/packages/emulators/standalone/rpcs3-sa/config/rpcs3/input_configs/active_profiles.yml
+++ b/packages/emulators/standalone/rpcs3-sa/config/rpcs3/input_configs/active_profiles.yml
--- a/packages/emulators/standalone/rpcs3-sa/config/rpcs3/input_configs/global/Default.yml
+++ b/packages/emulators/standalone/rpcs3-sa/config/rpcs3/input_configs/global/Default.yml
--- a/packages/emulators/standalone/rpcs3-sa/package.mk
+++ b/packages/emulators/standalone/rpcs3-sa/package.mk
@ -69,12 +69,13 @@ pre_make_target() {
 post_makeinstall_target() {
  # Copy scripts
  mkdir -p ${INSTALL}/usr/bin/
-   cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin/
+  cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin/

  # Copy config & resources
  mkdir -p ${INSTALL}/usr/config/rpcs3
-   cp -PR ${PKG_DIR}/config/rpcs3                           ${INSTALL}/usr/config/rpcs3/
-   cp -PR ${INSTALL}/usr/share/rpcs3/{GuiConfigs,Icons} ${INSTALL}/usr/config/rpcs3/ 
+  cp -r ${PKG_DIR}/config/* ${INSTALL}/usr/config/rpcs3/
+  cp ${INSTALL}/usr/share/rpcs3/GuiConfigs/* ${INSTALL}/usr/config/rpcs3/GuiConfigs/
+  cp -PR ${INSTALL}/usr/share/rpcs3/Icons ${INSTALL}/usr/config/rpcs3/Icons

  # Clean up
  safe_remove ${INSTALL}/usr/share
--- a/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh
+++ b/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh
@ -5,32 +5,53 @@

 . /etc/profile

-#Check if rpcs3 exists in .config
+# Check if rpcs3 exists in .config
 if [ ! -d "/storage/.config/rpcs3" ]; then
-    mkdir -p "/storage/.config/rpcs3"
-        cp -r "/usr/config/rpcs3" "/storage/.config/"
+  mkdir -p "/storage/.config/rpcs3"
+  cp -r "/usr/config/rpcs3" "/storage/.config/rpcs3"
 fi

-#Link rpcs3sa dev_flash to bios folder
-if [ ! -d "/storage/roms/bios/rpcs3/dev_flash" ]; then
-    mkdir -p "/storage/bios/rpcs3/dev_flash"
-fi
-rm -rf /storage/.config/rpcs3/dev_flash
-ln -sf /storage/roms/bios/rpcs3/dev_flash /storage/.config/rpcs3/dev_flash
+# Link certain RPCS3 folders to a location in /storage/roms/bios
+FOLDER_LINKS=("dev_flash" "dev_hdd0" "dev_hdd1" "custom_configs")
+for FOLDER_LINK in "${FOLDER_LINKS[@]}"; do
+  TARGET_FOLDER="/storage/roms/bios/rpcs3/$FOLDER_LINK"
+  SOURCE_FOLDER="/storage/.config/rpcs3/$FOLDER_LINK"

-#Emulation Station Features
-  GAME=$(echo "${1}"| sed "s#^/.*/##")
-  SUI=$(get_setting start_ui ps3 "${GAME}")
-
-#Run Rpcs3 emulator
-  if [ "$SUI" = "1" ]
-  then
-	export QT_QPA_PLATFORM=wayland
-        jslisten set "-9 rpcs3"
-	/usr/bin/rpcs3
-  else
-	export QT_QPA_PLATFORM=xcb
-	export SDL_AUDIODRIVER=pulseaudio
-        jslisten set "-9 rpcs3"
-	/usr/bin/rpcs3 --no-gui "${1}"
+  # Create the target folder if it doesn't exist
+  if [ ! -d "$TARGET_FOLDER" ]; then
+      mkdir -p "$TARGET_FOLDER"
  fi
+
+  # Remove existing source folder
+  rm -rf "$SOURCE_FOLDER"
+
+  # Create symbolic link
+  ln -sf "$TARGET_FOLDER" "$SOURCE_FOLDER"
+done
+
+# EmulationStation Features
+GAME=$(echo "${1}" | sed "s#^/.*/##")
+SUI=$(get_setting start_ui ps3 "${GAME}")
+
+# Check if its a PSN game
+GAME_PATH=""
+PSNID=""
+if [[ "${1}" == *.psn ]]; then
+  # Hardcoded now for testing
+  read -r PSNID < "${1}"
+  GAME_PATH="/storage/.config/rpcs3/dev_hdd0/game/${PSNID}/USRDIR/EBOOT.BIN"
+else
+  GAME_PATH="${1}"
+fi
+
+# Run rpcs3
+if [ "$SUI" = "1" ]; then
+  export QT_QPA_PLATFORM=wayland
+  jslisten set "-9 rpcs3"
+  /usr/bin/rpcs3
+else
+  export QT_QPA_PLATFORM=xcb
+  export SDL_AUDIODRIVER=pulseaudio
+  jslisten set "-9 rpcs3"
+	/usr/bin/rpcs3 --no-gui "$GAME_PATH"
+fi
--- a/packages/virtual/emulators/sources/Start
+++ b/packages/virtual/emulators/sources/Start
@ -5,6 +5,24 @@

 source /etc/profile

+# Link certain RPCS3 folders to a location in /storage/roms/bios
+FOLDER_LINKS=("dev_flash" "dev_hdd0" "dev_hdd1" "custom_configs")
+for FOLDER_LINK in "${FOLDER_LINKS[@]}"; do
+  TARGET_FOLDER="/storage/roms/bios/rpcs3/$FOLDER_LINK"
+  SOURCE_FOLDER="/storage/.config/rpcs3/$FOLDER_LINK"
+
+  # Create the target folder if it doesn't exist
+  if [ ! -d "$TARGET_FOLDER" ]; then
+      mkdir -p "$TARGET_FOLDER"
+  fi
+
+  # Remove existing source folder
+  rm -rf "$SOURCE_FOLDER"
+
+  # Create symbolic link
+  ln -sf "$TARGET_FOLDER" "$SOURCE_FOLDER"
+done
+
 jslisten set "rpcs3"

 /usr/bin/rpcs3 >/dev/null 2>&1