Module: wine
Branch: master
Commit: e5becbf6a8528a08049c3575ff3447b863085ded
URL: https://gitlab.winehq.org/wine/wine/-/commit/e5becbf6a8528a08049c3575ff3447…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Sun Jan 28 15:29:08 2024 +0100
configure: Reset host flags in all cross-compiler error paths.
---
configure | 21 ++++++++-------------
configure.ac | 21 ++++++++-------------
2 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/configure b/configure
index ae5def6a6b1..165cd9c73e6 100755
--- a/configure
+++ b/configure
@@ -10340,6 +10340,10 @@ else $as_nop
fi
fi
+saved_CC=$CC
+saved_CFLAGS=$CFLAGS
+saved_LDFLAGS=$LDFLAGS
+
for wine_arch in $cross_archs
do
case "x$with_mingw" in
@@ -10603,10 +10607,6 @@ test -n "$x86_64_CC" || x86_64_CC="false"
esac
fi
- saved_CC=$CC
- saved_CFLAGS=$CFLAGS
- saved_LDFLAGS=$LDFLAGS
-
CFLAGS=${CROSSCFLAGS:-"-g -O2"}
LDFLAGS=$CROSSLDFLAGS
eval CC=\$${wine_arch}_CC
@@ -10768,9 +10768,6 @@ then :
as_fn_error $? "MinGW $wine_arch compiler not found.
This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5
fi
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
continue
fi
@@ -10814,9 +10811,6 @@ fi
printf "%s\n" "none needed" >&6; } ;;
xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
if test ${enable_archs+y}
then :
as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found.
@@ -11964,11 +11958,12 @@ then :
as_fn_append ${wine_arch}_LDFLAGS " -Wl,--build-id"
fi }
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
done
+CC=$saved_CC
+CFLAGS=$saved_CFLAGS
+LDFLAGS=$saved_LDFLAGS
+
if test $HOST_ARCH = aarch64
then
test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 475743bc121..b2ec7c4c7c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,6 +833,10 @@ AS_VAR_SET_IF([enable_archs],
test $HOST_ARCH = unknown || cross_archs=$HOST_ARCH
fi])
+saved_CC=$CC
+saved_CFLAGS=$CFLAGS
+saved_LDFLAGS=$LDFLAGS
+
for wine_arch in $cross_archs
do
case "x$with_mingw" in
@@ -859,10 +863,6 @@ do
;;
esac])
- saved_CC=$CC
- saved_CFLAGS=$CFLAGS
- saved_LDFLAGS=$LDFLAGS
-
CFLAGS=${CROSSCFLAGS:-"-g -O2"}
LDFLAGS=$CROSSLDFLAGS
AS_VAR_COPY([CC],[${wine_arch}_CC])
@@ -924,9 +924,6 @@ do
AS_VAR_SET_IF([enable_archs],
[AC_MSG_ERROR([MinGW $wine_arch compiler not found.
This is an error since --enable-archs=$wine_arch was requested.])])
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
continue
fi
@@ -948,9 +945,6 @@ This is an error since --enable-archs=$wine_arch was requested.])])
case "x$res" in
x) AC_MSG_RESULT([none needed]) ;;
xno) AC_MSG_RESULT([unsupported])
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
AS_VAR_SET_IF([enable_archs],
[AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found.
This is an error since --enable-archs=$wine_arch was requested.])])
@@ -1040,11 +1034,12 @@ This is an error since --enable-archs=$wine_arch was requested.])])
[AS_VAR_APPEND([${wine_arch}_CFLAGS],[" -Wl,--build-id"])
AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--build-id"])])
- CC=$saved_CC
- CFLAGS=$saved_CFLAGS
- LDFLAGS=$saved_LDFLAGS
done
+CC=$saved_CC
+CFLAGS=$saved_CFLAGS
+LDFLAGS=$saved_LDFLAGS
+
if test $HOST_ARCH = aarch64
then
test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.])
Module: vkd3d
Branch: master
Commit: 1f536238a89dc6bccb411c2db32d7b2010cc8fd7
URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1f536238a89dc6bccb411c2db32d7…
Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date: Mon Jan 22 17:15:36 2024 +0100
vkd3d-shader: Use 64 bit swizzles for 64 bit data types in VSIR.
The handling of write masks and swizzles for 64 bit data types is
currently irregular: write masks are always 64 bit, while swizzles
are usually 32 bit, except for SSA registers with are 64 bit.
With this change we always use 64 bit swizzles, in order to make
the situation less surprising and make it easier to convert
registers between SSA and TEMP.
64 bit swizzles are always required to have X in their last two
components.
---
libs/vkd3d-shader/d3d_asm.c | 17 ++++++++----
libs/vkd3d-shader/dxil.c | 12 ++++++--
libs/vkd3d-shader/spirv.c | 31 +++++++++++++--------
libs/vkd3d-shader/tpf.c | 3 ++
libs/vkd3d-shader/vkd3d_shader_private.h | 47 +++++++++++++++++++++++++++++---
5 files changed, 87 insertions(+), 23 deletions(-)