Merge pull request #3062 from r3claimer/dev

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

Author: r3claimer

packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh

@@ -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}")
 
@@ -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@

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh

@@ -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"

packages/ui/emulationstation/config/common/es_features.cfg

@@ -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"/>