Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

Enable reduced x87 precision for FEX

Logan78d17355324e
diff --git a/dylib/feats/compat_run.sh b/dylib/feats/compat_run.sh
index 30fe947..3e9ce37 100755
--- a/dylib/feats/compat_run.sh
+++ b/dylib/feats/compat_run.sh
@@ -182,6 +182,7 @@ if [ "${wine_unix##*/}" = aarch64-unix ]; then
unset -v "$name"
np_dropped="$np_dropped${np_dropped:+ }$name"
done
+ export FEX_X87REDUCEDPRECISION="${FEX_X87REDUCEDPRECISION-1}"
fi
# Keeps Wine from inheriting the prefix and template locks (fd 8 and 9).
@@ -1605,7 +1606,7 @@ else
echo "=== client staged no overlay renderer, overlay disabled ===" >> "$log" 2>&1 || true
fi
set -- --args "$shim_exe" "$@"
-for name in $(env | LC_ALL=C sed -nE 's/^(CX_APPLEGPTK_LIBD3DSHARED_PATH|Steam[A-Za-z0-9]*|(CX_GRAPHICS|D3DM_|DXMT_|DXVK_|MTL_|ROSETTA_)[A-Z0-9_]*)=.*/\1/p'); do
+for name in $(env | LC_ALL=C sed -nE 's/^(CX_APPLEGPTK_LIBD3DSHARED_PATH|Steam[A-Za-z0-9]*|(CX_GRAPHICS|D3DM_|DXMT_|DXVK_|FEX_|MTL_|ROSETTA_)[A-Z0-9_]*)=.*/\1/p'); do
eval "value=\$$name"
# shellcheck disable=SC2154 # eval assigns value on the line above
set -- --env "$name=$value" "$@"
diff --git a/dylib/tests/envcheck.sh b/dylib/tests/envcheck.sh
index 32cb948..1e74d2b 100755
--- a/dylib/tests/envcheck.sh
+++ b/dylib/tests/envcheck.sh
@@ -124,6 +124,32 @@ is "other backends stay" "CX_GRAPHICS_BACKEND DXMT_CONFIG " "$(seen)"
is "nothing to ignore logs nothing" "" "$np_dropped"
unset -v CX_GRAPHICS_BACKEND DXMT_CONFIG
+echo "== FEX reduced x87 precision =="
+unset -v FEX_X87REDUCEDPRECISION
+wine_unix="/R R/lib/wine/x86_64-unix"
+eval "$drop"
+is "x86_64 Wine leaves it unset" "unset" "${FEX_X87REDUCEDPRECISION-unset}"
+wine_unix="/R R/lib/wine/aarch64-unix"
+eval "$drop"
+is "arm64 Wine turns it on" "1" "$FEX_X87REDUCEDPRECISION"
+is "helpers inherit it" "1" "$(sh -c 'printf %s "$FEX_X87REDUCEDPRECISION"')"
+FEX_X87REDUCEDPRECISION=0
+eval "$drop"
+is "a launch option of 0 is kept" "0" "$FEX_X87REDUCEDPRECISION"
+FEX_X87REDUCEDPRECISION=
+eval "$drop"
+is "an empty launch option is kept" "" "$FEX_X87REDUCEDPRECISION"
+export FEX_X87REDUCEDPRECISION=0 FEX_MULTIBLOCK=0
+set --
+eval "$forward"
+fex_args=""
+for arg in "$@"; do
+ case "$arg" in FEX_*) fex_args="$fex_args$arg
+" ;; esac
+done
+is "FEX settings reach the game" "FEX_MULTIBLOCK=0 FEX_X87REDUCEDPRECISION=0 " "$(printf %s "$fex_args" | sort | tr '\n' ' ')"
+unset -v FEX_X87REDUCEDPRECISION FEX_MULTIBLOCK
+
if [ "$fails" -eq 0 ]; then
echo "==> envcheck: all assertions hold"
else