From d235ddf23ca22f8ef1ab49f1adab1970719009c4 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Fri, 29 Dec 2023 19:25:49 +0000 Subject: [PATCH] * Add OpenGL/Vulkan selection feature to CEMU. * Fix broken OpenGL for CEMU. --- .../standalone/cemu-sa/scripts/start_cemu.sh | 12 ++++++++++++ packages/graphics/glfw/package.mk | 2 +- packages/graphics/wxwidgets/package.mk | 5 +++-- .../emulationstation/config/common/es_features.cfg | 4 ++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh b/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh index 22643724d1..e964b20f04 100755 --- 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 index 6b5d353795..d3a4a39135 100644 --- 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 index 2c2941a4d3..a71e722865 100644 --- 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 index eaeb2009bc..6023578d97 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -484,6 +484,10 @@ + + + +