diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/config/RG552/mupen64plus.cfg b/packages/games/emulators/mupen64plussa/mupen64plussa-core/config/RG552/mupen64plus.cfg index 58f05acb5..87d260790 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/config/RG552/mupen64plus.cfg +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/config/RG552/mupen64plus.cfg @@ -406,10 +406,9 @@ Rotate = 0 # Leave enabled unless a mobile gpu doesn't support it. EnableFragmentDepthWrite = 0 # Hardware per pixel lighting, supposedly good for GLES3.1 devices or higher. -EnableHWLighting = 0 +EnableHWLighting = 1 # Do not use shaders to emulate N64 blending modes. Works faster on slow GPU. Can cause glitches. -EnableLegacyBlending = 1 -# ^^ If this doesn't work, simply declare it a mesa issue. +EnableLegacyBlending = 0 ###### Enhancements ####### # Internal render resoluton rather than output. So 2 x 240p is 480p, etc. diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh index 7f018d3a4..df1e2d1b4 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh @@ -104,7 +104,7 @@ else fi # RSP -RSP=$(get_setting rsp_plugin) +RSP=$(get_setting rsp_plugin n64) if [ "${RSP}" == "default" ] || [ "${RSP}" == "hle" ]; then SET_PARAMS="$SET_PARAMS --set UI-Console[RspPlugin]=mupen64plus-rsp-hle.so" else diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk index acd3b057a..f4f83d079 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk @@ -33,7 +33,10 @@ make_target() { export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -D_REENTRANT" export SDL_LDLIBS="-lSDL2_net -lSDL2" - export USE_GLES=1 + if [ "${DEVICE}" = "RG552" || "${DEVICE}" = "X86_64"] + then + export USE_GLES=1 + fi export V=1 export OSD=0 make -C projects/unix clean diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk index a6f4f65a1..7e04c70fb 100644 --- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk +++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk @@ -24,9 +24,14 @@ make_target() { case ${ARCH} in arm|aarch64) export HOST_CPU=aarch64 - export USE_GLES=1 BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi" - PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DEGL=0n -DNEON_OPT=On" + if [ "${DEVICE}" = "RG552" ] + then + PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DNEON_OPT=On" + else + export USE_GLES=1 + PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DEGL=0n -DNEON_OPT=On" + fi ;; esac export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus diff --git a/packages/games/emulators/retroarch/sources/RG552/retroarch-core-options.cfg b/packages/games/emulators/retroarch/sources/RG552/retroarch-core-options.cfg index ac4e6ff4b..f0f312272 100644 --- a/packages/games/emulators/retroarch/sources/RG552/retroarch-core-options.cfg +++ b/packages/games/emulators/retroarch/sources/RG552/retroarch-core-options.cfg @@ -19,9 +19,9 @@ mupen64plus-EnableEnhancedTextureStorage = "False" mupen64plus-EnableFBEmulation = "True" mupen64plus-EnableFragmentDepthWrite = "False" mupen64plus-EnableHiResAltCRC = "False" -mupen64plus-EnableHWLighting = "False" +mupen64plus-EnableHWLighting = "True" mupen64plus-EnableInaccurateTextureCoordinates = "False" -mupen64plus-EnableLegacyBlending = "True" +mupen64plus-EnableLegacyBlending = "False" mupen64plus-EnableLODEmulation = "True" mupen64plus-EnableNativeResFactor = "1" mupen64plus-EnableNativeResTexrects = "Optimized"