Merge branch 'master' into metal

UI: Fix compatibility list crashing (missing font)
Revert "Revert the Metal Experiment (#701 )"
2025-02-23 17:29:01 -06:00 · 2025-02-22 23:48:47 -06:00 · 2025-02-22 21:33:38 -06:00 · 2025-02-22 21:26:46 -06:00
1 changed files with 1 additions and 39 deletions
--- a/distribution/linux/Ryujinx.sh
+++ b/distribution/linux/Ryujinx.sh
@@ -20,42 +20,4 @@ if command -v gamemoderun > /dev/null 2>&1; then
    COMMAND="$COMMAND gamemoderun"
 fi

-# Check if user already has a manual Avalonia scaling override or session type is x11.
-if [[ -n "${AVALONIA_GLOBAL_SCALE_FACTOR-}" || "$(echo "$XDG_SESSION_TYPE")" == "x11" ]]; then
-    echo "Scaling: Performed by environment, skipping." >&2
-else
-    # Query monitor config directly (GNOME), default display only.
-    if [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "GNOME" && -f ~/.config/monitors.xml ]] then
-        echo -n 'Scaling: Monitor config located, querying scale...' >&2
-        SCALING="$(grep '<scale' ~/.config/monitors.xml -m 1 | cut -f2 -d">"|cut -f1 -d"<")"
-        SCALING="${SCALING##* }"
-        echo "found! Factor: ${SCALING}" >&2
-
-    # Fallback to X DPI query for others.
-    # Plasma handles this fine, GNOME will always round up e.g. 1.25 -> 2.00.
-    elif command -v xrdb >/dev/null; then
-        echo -n 'Scaling: Attempting to get scaling from X DPI value...' >&2
-        dpi="$(xrdb -get Xft.dpi)"
-        if [[ -n "${dpi}" ]]; then
-            SCALING=$(echo "scale=2; ${dpi}/96" | bc)
-        fi
-        echo "found! Factor: ${SCALING}"
-
-    # Query kscreen-doctor for Plasma as a fallback.
-    elif [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "KDE" ]] && command -v kscreen-doctor >/dev/null; then
-        echo -n 'Scaling: Attempting to get Plasma desktop scaling factor...' >&2
-        SCALING="$(kscreen-doctor --outputs | grep "Scale" -m 1)"
-        SCALING="${SCALING##* }"
-        SCALING=$(echo $SCALING | sed 's/\x1B\[[0-9;]*m//g') # Trim ANSI chars from ksd output.
-        echo "found! Factor: ${SCALING}"
-    fi
-
-    if [[ -z "${SCALING-}" || "${SCALING-}" == "0" ]]; then
-        echo 'Unset invalid scaling value' >&2
-        SCALING="1"
-    fi
-
-    COMMAND="$COMMAND AVALONIA_GLOBAL_SCALE_FACTOR=$SCALING"
-fi
-
-exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
+exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
Author	SHA1	Message	Date
Evan Husted	38ed71ddfe	Merge branch 'master' into metal	2025-02-23 17:29:01 -06:00
Evan Husted	3ffcc72117	UI: Fix compatibility list crashing (missing font)	2025-02-22 23:48:47 -06:00
Evan Husted	80d619f010	Revert "Revert the Metal Experiment (#701 )" This reverts commit `fe1617ffea`.	2025-02-22 21:33:38 -06:00
Evan Husted	fe1617ffea	Revert the Metal Experiment (#701 ) Metal sounded like a good idea to get in the emulator but frankly I underestimated just how experimental and not ready it was. From my write up in the Discord: ``` As is, Metal supports only a few games. The games it does support freeze on first use of not playing them via Vulkan, because shader translation is broken. So you need to use a dirty hack to not delete all your shaders. Not to mention it breaks many games via MoltenVK because of changes to the shared GPU code. Merging Metal seemed like a great idea, because of the few games it does support. But I don't think it's worth it. Many of the games it breaks via MoltenVK don't work via Metal. Which effectively makes current Ryubing worse for Mac users than Ryujinx 1.1.1403. I think what I'm gonna do is revert Metal, and reopen it as a PR. That way, you can still take advantage of the Metal backend as is, but without making other games worse with no solution. ``` For what it's worth, the shader translation part could at least be "fixed" by always applying a 30ms delay for shader translation to Metal. That being said, that solution sucks ass. The MoltenVK regressions are even worse. I hope this is not a let down to the Mac users. I hope you realize I'm reverting this because you're actively getting a worse experience with it in the emulator.	2025-02-22 21:26:46 -06:00