Merge pull request #1817 from r3claimer/next

MelonDS, fix opengl, add extra es features

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/package.mk

@@ -27,7 +27,7 @@ then
   PKG_DEPENDS_TARGET+=" ${VULKAN}"
 fi
 
-pre_configure_host() {
+pre_configure_target() {
 export CFLAGS+=" -Wno-sign-compare"
 export CXXFLAGS="${CXXFLAGS} -Wno-sign-compare"
 

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

@@ -32,6 +32,7 @@ fi
 GAME=$(echo "${1}" | sed "s#^/.*/##")
 PLATFORM=$(echo "${2}"| sed "s#^/.*/##")
 GRENDERER=$(get_setting graphics_backend "${PLATFORM}" "${GAME}")
+IRES=$(get_setting internal_resolution "${PLATFORM}" "${GAME}")
 SORIENTATION=$(get_setting screen_orientation "${PLATFORM}" "${GAME}")
 SLAYOUT=$(get_setting screen_layout "${PLATFORM}" "${GAME}")
 SWAP=$(get_setting screen_swap "${PLATFORM}" "${GAME}")
@@ -46,21 +47,28 @@ unset EMUPERF
 [ "${CORES}" = "big" ] && EMUPERF="${FAST_CORES}"
 
 #Graphics Backend
-if [ "$GRENDERER" = "1" ]; then
-	sed -i '/^ScreenUseGL=/c\ScreenUseGL=1' "${CONF_DIR}/${MELONDS_INI}"
+if [ "$GRENDERER" > "0" ]; then
+	sed -i "/^GL_ScaleFactor=/c\GL_ScaleFactor=$GRENDERER" "${CONF_DIR}/${MELONDS_INI}"
 else
-	sed -i '/^ScreenUseGL=/c\ScreenUseGL=0' "${CONF_DIR}/${MELONDS_INI}"
+	sed -i '/^GL_ScaleFactor=/c\GL_ScaleFactor=0' "${CONF_DIR}/${MELONDS_INI}"
+fi
+
+#Internal Resolution
+if [ "$IRES" > "0" ]; then
+        sed -i "/^ScreenUseGL=/c\ScreenUseGL=$IRES" "${CONF_DIR}/${MELONDS_INI}"
+else
+        sed -i '/^ScreenUseGL=/c\ScreenUseGL=1' "${CONF_DIR}/${MELONDS_INI}"
 fi
 
 #Screen Orientation
-if [ "$SORIENTATION" ] > "0"; then
+if [ "$SORIENTATION" > "0" ]; then
 	sed -i "/^ScreenLayout=/c\ScreenLayout=$SORIENTATION" "${CONF_DIR}/${MELONDS_INI}"
 else
 	sed -i '/^ScreenLayout=/c\ScreenLayout=2' "${CONF_DIR}/${MELONDS_INI}"
 fi
 
 #Screen Layout
-if [ "$SLAYOUT" ] > "0"; then
+if [ "$SLAYOUT" > "0" ]; then
 	sed -i "/^ScreenSizing=/c\ScreenSizing=$SLAYOUT" "${CONF_DIR}/${MELONDS_INI}"
 else
 	sed -i '/^ScreenSizing=/c\ScreenSizing=0' "${CONF_DIR}/${MELONDS_INI}"
@@ -107,7 +115,7 @@ else
 fi
 
 #Set QT Platform to Wayland
-export QT_QPA_PLATFORM=wayland
+export QT_QPA_PLATFORM=xcb
 @PANFROST@
 @HOTKEY@
 @LIBMALI@

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

@@ -1108,7 +1108,15 @@
      <features>
       <feature name="graphics backend">
         <choice name="software" value="0"/>
-        <choice name="opengl" value="1"/>
+        <choice name="opengl (classic)" value="1"/>
+        <choice name="opengl (computer shader)" value="2"/>
+      </feature>
+      <feature name="internal resolution">
+        <choice name="1x (256x192)" value="1"/>
+        <choice name="2x (512x384)" value="2"/>
+        <choice name="3x (768x576)" value="3"/>
+        <choice name="4x (1024x768)" value="4"/>
+        <choice name="5x (1280x960)" value="5"/>
       </feature>
       <feature name="screen orientation">
         <choice name="vertical" value="1"/>
@@ -1137,8 +1145,8 @@
         <choice name="no" value="0"/>
       </feature>
       <feature name="vsync">
-        <choice name="off" value="0"/>
         <choice name="on" value="1"/>
+        <choice name="off" value="0"/>
       </feature>
     </features>
     </core>