Merge pull request #854 from sydarn/libmali-vulkan-sway

Libmali vulkan sway
ROCKNIX · Dec 22, 2024 · 8b06275 · 8b06275
2 parents b383d27 + a75461b
commit 8b06275
Show file tree

Hide file tree

Showing 29 changed files with 655 additions and 233 deletions.
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
@@ -70,7 +70,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**mednafen:** gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc<br>**dolphin:** dolphin-qt-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nesh<br>|
 |Nintendo|Nintendo 3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**retroarch:** panda3ds (default)<br>|
 |Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
@@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Super Nintendo (Hacks) (snesh)|1991|`snesh`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>**mednafen:** snes_faust<br>|
 |Nintendo|Super Nintendo (snes)|1991|`snes`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>**mednafen:** snes_faust<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**mednafen:** snes_faust<br>|
 |Nintendo|Virtual Boy (virtualboy)|1995|`virtualboy`|.vb .zip .7z|**retroarch:** beetle_vb (default)<br>**mednafen:** vb<br>|
-|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii (default)<br>**retroarch:** dolphin<br>|
+|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii<br>**dolphin:** dolphin-qt-wii (default)<br>**retroarch:** dolphin<br>|
 |Palm, Inc.|Palm OS (palm)|1996|`palm`|.prc .pqa .img .pdb .zip|**retroarch:** mu (default)<br>|
 |Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
 |Philips|CD-i (cdi)|1991|`cdi`|.chd .cue .iso|**retroarch:** same_cdi (default)<br>|

diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
@@ -70,7 +70,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**dolphin:** dolphin-qt-gc<br>**retroarch:** dolphin<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Nintendo 3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**lime3ds:** lime3ds-sa (default)<br>|
 |Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
@@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Super Nintendo (Hacks) (snesh)|1991|`snesh`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>|
 |Nintendo|Super Nintendo (snes)|1991|`snes`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes<br>**retroarch:** bsnes_hd_beta<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>**retroarch:** bsnes_mercury_accuracy<br>**retroarch:** bsnes_mercury_balanced<br>|
 |Nintendo|Virtual Boy (virtualboy)|1995|`virtualboy`|.vb .zip .7z|**retroarch:** beetle_vb (default)<br>|
-|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii (default)<br>**retroarch:** dolphin<br>|
+|Nintendo|Wii (wii)|2006|`wii`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .wad|**dolphin:** dolphin-sa-wii (default)<br>**dolphin:** dolphin-qt-gc<br>**retroarch:** dolphin<br>|
 |Palm, Inc.|Palm OS (palm)|1996|`palm`|.prc .pqa .img .pdb .zip|**retroarch:** mu (default)<br>|
 |Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
 |Philips|CD-i (cdi)|1991|`cdi`|.chd .cue .iso|**retroarch:** same_cdi (default)<br>|

diff --git a/packages/emulators/standalone/dolphin-sa/config/AMD64/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/AMD64/Dolphin.ini
@@ -70,6 +70,7 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4

diff --git a/packages/emulators/standalone/dolphin-sa/config/RK3399/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/RK3399/Dolphin.ini
@@ -70,6 +70,7 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4

diff --git a/packages/emulators/standalone/dolphin-sa/config/RK3566/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/RK3566/Dolphin.ini
@@ -70,6 +70,7 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4

diff --git a/packages/emulators/standalone/dolphin-sa/config/RK3588/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/RK3588/Dolphin.ini
@@ -70,14 +70,15 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4
 Fastmem = True
 CPUThread = True
 DSPHLE = True
 SkipIdle = True
-SyncOnSkipIdle = True
+SyncOnSkipIdle = False
 SyncGPU = False
 SyncGpuMaxDistance = 200000
 SyncGpuMinDistance = -200000
@@ -120,9 +121,9 @@ RunCompareServer = False
 RunCompareClient = False
 EmulationSpeed = 1.00000000
 FrameSkip = 0x00000003
-Overclock = 4.00000000
+Overclock = 1.0
 OverclockEnable = False
-GFXBackend = OGL 
+GFXBackend = Vulkan
 GPUDeterminismMode = auto
 PerfMapDir = 
 [Movie]
@@ -138,6 +139,7 @@ DumpUCode = False
 Backend = Pulse
 Volume = 100
 CaptureLog = False
+DSPThread = True
 [Input]
 BackgroundInput = False
 [FifoPlayer]

diff --git a/packages/emulators/standalone/dolphin-sa/config/RK3588/Hotkeys.ini b/packages/emulators/standalone/dolphin-sa/config/RK3588/Hotkeys.ini
@@ -0,0 +1,10 @@
+[Hotkeys]
+Device = evdev/0/Microsoft X-Box 360 pad
+Graphics Toggles/Toggle Aspect Ratio = @(MODE+EAST)
+General/Take Screenshot = @(MODE+SOUTH)
+Save State/Save to Selected Slot = @(MODE+TR)
+Load State/Load State Slot 1 = @(MODE+TL)
+Other State Hotkeys/Increase Selected State Slot = @(MODE+`Axis 7-`)
+Other State Hotkeys/Decrease Selected State Slot = @(MODE+`Axis 7+`)
+Emulation Speed/Increase Emulation Speed = @(MODE+`Full Axis 5+`)
+Emulation Speed/Decrease Emulation Speed = @(MODE+`Full Axis 2+`)
diff --git a/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini
@@ -70,6 +70,7 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4

diff --git a/packages/emulators/standalone/dolphin-sa/config/S922X/Hotkeys.ini b/packages/emulators/standalone/dolphin-sa/config/S922X/Hotkeys.ini
@@ -0,0 +1,10 @@
+[Hotkeys]
+Device = evdev/0/Microsoft X-Box 360 pad
+Graphics Toggles/Toggle Aspect Ratio = @(MODE+EAST)
+General/Take Screenshot = @(MODE+SOUTH)
+Save State/Save to Selected Slot = @(MODE+TR)
+Load State/Load State Slot 1 = @(MODE+TL)
+Other State Hotkeys/Increase Selected State Slot = @(MODE+`Axis 7-`)
+Other State Hotkeys/Decrease Selected State Slot = @(MODE+`Axis 7+`)
+Emulation Speed/Increase Emulation Speed = @(MODE+`Full Axis 5+`)
+Emulation Speed/Decrease Emulation Speed = @(MODE+`Full Axis 2+`)
diff --git a/packages/emulators/standalone/dolphin-sa/config/SD865/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/SD865/Dolphin.ini
@@ -70,6 +70,7 @@ ColumnRegion = True
 ColumnSize = True
 ColumnState = True
 [Core]
+SkipIPL = True
 HLE_BS2 = False
 TimingVariance = 40
 CPUCore = 4

diff --git a/packages/emulators/standalone/dolphin-sa/package.mk b/packages/emulators/standalone/dolphin-sa/package.mk
@@ -9,7 +9,16 @@ PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games f
 PKG_TOOLCHAIN="cmake"
 
 case ${DEVICE} in
-  SD865|AMD64|RK3399)
+  RK3566)
+    PKG_SITE="https://github.com/dolphin-emu/dolphin"
+    PKG_URL="${PKG_SITE}.git"
+    PKG_VERSION="e6583f8bec814d8f3748f1d7738457600ce0de56"
+    PKG_PATCH_DIRS+=" wayland"
+    PKG_CMAKE_OPTS_TARGET+=" -DENABLE_QT=OFF \
+                             -DUSE_RETRO_ACHIEVEMENTS=OFF \
+                             -DENABLE_HEADLESS=ON"
+  ;;
+  *)
     PKG_VERSION="8c3b9c9cf6a4c40e773c5b13ed4dc7ea1912d05b"
     PKG_SITE="https://github.com/dolphin-emu/dolphin"
     PKG_URL="${PKG_SITE}.git"
@@ -19,15 +28,6 @@ case ${DEVICE} in
                              -DUSE_RETRO_ACHIEVEMENTS=ON \
                              -DENABLE_HEADLESS=OFF"
   ;;
-  *)
-    PKG_SITE="https://github.com/dolphin-emu/dolphin"
-    PKG_URL="${PKG_SITE}.git"
-    PKG_VERSION="e6583f8bec814d8f3748f1d7738457600ce0de56"
-    PKG_PATCH_DIRS+=" wayland"
-    PKG_CMAKE_OPTS_TARGET+=" -DENABLE_QT=OFF \
-                             -DUSE_RETRO_ACHIEVEMENTS=OFF \
-                             -DENABLE_HEADLESS=ON"
-  ;;
 esac
 
 if [ "${OPENGL_SUPPORT}" = "yes" ]; then
@@ -89,17 +89,11 @@ makeinstall_target() {
 
 post_install() {
     case ${DEVICE} in
-      RK3588)
-        DOLPHIN_PLATFORM="\${PLATFORM}"
-        EXPORTS="if [ ! -z 'lsmod | grep panthor' ]; then LD_LIBRARY_PATH='\/usr\/lib\/libmali-valhall-g610-g13p0-x11-gbm.so' PLATFORM='wayland'; else PLATFORM='x11'; fi"
-      ;;
-      SD865|AMD64|RK3399)
-        DOLPHIN_PLATFORM="x11"
-        EXPORTS="export QT_QPA_PLATFORM=xcb"
+      RK3566)
+        DOLPHIN_PLATFORM="wayland"
       ;;
       *)
-        DOLPHIN_PLATFORM="wayland"
-        EXPORTS=""
+        DOLPHIN_PLATFORM="x11"
       ;;
     esac
     sed -e "s/@DOLPHIN_PLATFORM@/${DOLPHIN_PLATFORM}/g" -i ${INSTALL}/usr/bin/start_dolphin_gc.sh