Merge pull request #2613 from fewtarius/dev

* Fixes CEMU OpenGL support and adds OpenGL/Vulkan selection feature to ES for CEMU.
JustEnoughLinuxOS · Dec 29, 2023 · 6208519 · 6208519
2 parents 36fb97a + d235ddf
commit 6208519
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh b/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh
@@ -65,12 +65,23 @@ FILE=$(echo $@ | sed "s#^/.*/##g")
 ONLINE=$(get_setting online_enabled wiiu "${FILE}")
 FPS=$(get_setting show_fps wiiu "${FILE}")
 CON=$(get_setting wiiu_controller_profile wiiu "${FILE}")
+RENDERER=$(get_setting graphics_backend wiiu "${FILE}")
 
 if [ -z "${FPS}" ]
 then
   FPS="0"
 fi
 
+# Assume Vulkan
+case ${RENDERER} in
+  opengl)
+    RENDERER=0
+  ;;
+  *)
+    RENDERER=1
+  ;;
+esac
+
 case ${CON} in
   "Wii U Pro Controller")
      CONFILE="wii_u_pro_controller.xml"
@@ -100,6 +111,7 @@ xmlstarlet ed --inplace -u "//Account/OnlineEnabled" -v "${ONLINE}" ${CEMU_CONFI
 xmlstarlet ed --inplace -u "//Overlay/Position" -v "${FPS}" ${CEMU_CONFIG_ROOT}/settings.xml
 xmlstarlet ed --inplace -u "//fullscreen" -v "true" ${CEMU_CONFIG_ROOT}/settings.xml
 xmlstarlet ed --inplace -u "//Audio/TVDevice" -v "${PASINK}" ${CEMU_CONFIG_ROOT}/settings.xml
+xmlstarlet ed --inplace -u "//Graphic/api" -v "${RENDERER}" ${CEMU_CONFIG_ROOT}/settings.xml
 xmlstarlet ed --inplace -u "//emulated_controller/type" -v "${CON}" ${CEMU_CONFIG_ROOT}/controllerProfiles/controller0.xml
 xmlstarlet ed --inplace -u "//emulated_controller/controller/uuid" -v "${UUID0}" ${CEMU_CONFIG_ROOT}/controllerProfiles/controller0.xml
 xmlstarlet ed --inplace -u "//emulated_controller/controller/display_name" -v "${CONTROLLER0}" ${CEMU_CONFIG_ROOT}/controllerProfiles/controller0.xml

diff --git a/packages/graphics/glfw/package.mk b/packages/graphics/glfw/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="glfw"
-PKG_VERSION="3eaf125"
+PKG_VERSION="e2c9264"
 PKG_ARCH="any"
 PKG_LICENSE="zlib"
 PKG_DEPENDS_TARGET="toolchain expat libdrm libxkbcommon libXrandr libXinerama libXcursor libXi Mako:host "

diff --git a/packages/graphics/wxwidgets/package.mk b/packages/graphics/wxwidgets/package.mk
@@ -2,11 +2,12 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="wxwidgets"
-PKG_VERSION="299b51d493da28f919029c75c231e11114f1a420"
+PKG_VERSION="a812fff"
+#PKG_VERSION="c372724b3448de02a9135835f99f15a26e35f979"
 PKG_LICENSE="wxWindows Library Licence"
 PKG_SITE="https://github.com/wxWidgets/wxWidgets"
 PKG_URL="${PKG_SITE}.git"
-PKG_GIT_CLONE_BRANCH="3.2"
+PKG_GIT_CLONE_BRANCH="3.2.2-hotfix"
 PKG_DEPENDS_TARGET="toolchain zlib libpng libjpeg-turbo gdk-pixbuf gtk3 libaio"
 PKG_LONGDESC="wxWidgets is a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls."
 PKG_BUILD_FLAGS="+pic"

diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg
@@ -484,6 +484,10 @@
    <cores>
     <core name="cemu-sa"> 
      <features>
+      <feature name="graphics backend">
+        <choice name="opengl" value="opengl"/>
+        <choice name="vulkan" value="vulkan"/>
+      </feature>
       <feature name="online enabled">
         <choice name="no" value="false"/>
         <choice name="yes" value="true"/>