Skip to content
This repository was archived by the owner on May 8, 2024. It is now read-only.

Fix Mupen64 fps setting causing crash, Adding FPS option to MelonDS SA #3062

Merged
r3claimer merged 1 commit into from
Mar 20, 2024
Merged

Fix Mupen64 fps setting causing crash, Adding FPS option to MelonDS SA #3062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ fi
SLAYOUT=$(get_setting screen_layout nds "${GAME}")
SWAP=$(get_setting screen_swap nds "${GAME}")
SROTATION=$(get_setting screen_rotation nds "${GAME}")
SHOWFPS=$(get_setting show_fps nds "${GAME}")
SUI=$(get_setting start_ui nds "${GAME}")
VSYNC=$(get_setting vsync nds "${GAME}")

Expand Down Expand Up @@ -88,6 +89,12 @@ fi
sed -i '/^ScreenVSync=/c\ScreenVSync=1' /storage/.config/melonDS/melonDS.ini
fi

#Show FPS
if [ "$SHOWFPS" = "1" ]
then
export GALLIUM_HUD="simple,fps"
fi

#Set QT Platform to Wayland
export QT_QPA_PLATFORM=wayland
@PANFROST@
Expand Down
5 changes: 1 addition & 4 deletions ...ages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,11 @@ else
SET_PARAMS+=" --set Video-Glide64mk2[aspect]=0"
fi
if [ "${FPS}" = "true" ]; then
export LIBGL_SHOW_FPS="1"
export GALLIUM_HUD="cpu+GPU-load+fps"
export GALLIUM_HUD="simple,fps"
SET_PARAMS+=" --set Video-GLideN64[ShowFPS]=True"
SET_PARAMS+=" --set Video-Glide64mk2[show_fps]=1"
SET_PARAMS+=" --set Video-Rice[ShowFPS]=True"
else
export LIBGL_SHOW_FPS="0"
export GALLIUM_HUD="off"
SET_PARAMS+=" --set Video-GLideN64[ShowFPS]=False"
SET_PARAMS+=" --set Video-Glide64mk2[show_fps]=0"
SET_PARAMS+=" --set Video-Rice[ShowFPS]=False"
Expand Down
4 changes: 4 additions & 0 deletions packages/ui/emulationstation/config/common/es_features.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,10 @@
<choice name="180" value="2"/>
<choice name="270" value="3"/>
</feature>
<feature name="show fps">
<choice name="yes" value="1"/>
<choice name="no" value="0"/>
</feature>
<feature name="vsync">
<choice name="off" value="0"/>
<choice name="on" value="1"/>
Expand Down