wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Ivo Ivanov : dinput: Ignore input caps from the PID usage page.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: eb223bf58da4fd1b5b6c9e4db391453b2b77972b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb223bf58da4fd1b5b6c9e4d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Oct 14 09:39:53 2021 +0200 dinput: Ignore input caps from the PID usage page. Prevents PID usage page input reports from being parsed and listed in the device objects, increasing the total number of buttons or axes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 16 ++++- dlls/dinput8/tests/hid.c | 171 ++++++++++++++++++++++++++------------------- 2 files changed, 115 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb223bf58da4fd1b5b6c…

1 0

Rémi Bernon : dinput8/tests: Remove old packet report id checks in HID driver.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: fe78540b51423fd5fdb5db4063938ca4cbd425b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe78540b51423fd5fdb5db40… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 14 09:39:52 2021 +0200 dinput8/tests: Remove old packet report id checks in HID driver. It's superseded with the new expect list, and generally invalid if report id is not 1. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 4a5bca85abc..45c9f3e14ab 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -498,7 +498,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -522,7 +521,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -547,7 +545,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -571,7 +568,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer );

1 0

Alexandre Julliard : include: Define all the __int* types also for msvcrt.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 9ae627316d98b3a0399bd6b5c2257bd47d596bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae627316d98b3a0399bd6b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 14:05:33 2021 +0200 include: Define all the __int* types also for msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 8f407bdb20c..79d0e3998d4 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -51,12 +51,23 @@ #include <sal.h> -#if !defined(_MSC_VER) && !defined(__int64) -# if defined(_WIN64) && !defined(__MINGW64__) -# define __int64 long -# else -# define __int64 long long -# endif +#ifndef _MSC_VER +# ifndef __int8 +# define __int8 char +# endif +# ifndef __int16 +# define __int16 short +# endif +# ifndef __int32 +# define __int32 int +# endif +# ifndef __int64 +# if defined(_WIN64) && !defined(__MINGW64__) +# define __int64 long +# else +# define __int64 long long +# endif +# endif #endif #ifndef NULL

1 0

Alexandre Julliard : include: Always add defines for the Interlocked* functions.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 19d5734e20d383c16dc0d616ebb8568f0a37fc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d5734e20d383c16dc0d616… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 12:16:09 2021 +0200 include: Always add defines for the Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 73 ++++++++++++++------------------------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 58f1267773d..ef731e29c52 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6308,6 +6308,19 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) /* Interlocked functions */ +#define InterlockedAnd _InterlockedAnd +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangePointer _InterlockedExchangePointer +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedOr _InterlockedOr + #ifdef _MSC_VER #pragma intrinsic(_InterlockedAnd) @@ -6332,66 +6345,13 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); -static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) -{ - return _InterlockedAnd( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) -{ - return _InterlockedIncrement16( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) -{ - return _InterlockedDecrement16( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) -{ - return _InterlockedOr( (long volatile *)dest, val ); -} - #ifndef __i386__ #pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchangePointer) -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); +void *_InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *_InterlockedExchangePointer(void *volatile*,void*); #else @@ -6531,6 +6491,9 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ #ifdef _WIN64 + +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 + #if defined(_MSC_VER) && !defined(__clang__) #pragma intrinsic(_InterlockedCompareExchange128)

1 0

Alexandre Julliard : configure: Always define _WIN32 for msvcrt builds.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: f7e1b0f9b76778d535ada846474a5638e15a6f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e1b0f9b76778d535ada846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 11:08:54 2021 +0200 configure: Always define _WIN32 for msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- include/msvcrt/corecrt.h | 12 ++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 56c78fc6295..d1edbdc684a 100755 --- a/configure +++ b/configure @@ -17613,7 +17613,8 @@ if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then : DELAYLOADFLAG="-Wl,-delayload," fi ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 + *) MSVCRTFLAGS="-D_WIN32" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : $as_echo_n "(cached) " >&6 diff --git a/configure.ac b/configure.ac index af1cf7303ba..da6ecf5a7a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2045,7 +2045,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= case $host_os in mingw32*) dnl Check for delayload linker support WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; - *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) + *) MSVCRTFLAGS="-D_WIN32" + WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index a02feb509e8..8f407bdb20c 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -25,8 +25,16 @@ #define __WINE_USE_MSVCRT #endif -#ifdef __WINE_WINE_PORT_H -# error You cannot use both wine/port.h and msvcrt headers +#ifdef __WINE_CONFIG_H +# error You cannot use config.h with msvcrt +#endif + +#ifndef _WIN32 +# define _WIN32 +#endif + +#ifndef WIN32 +# define WIN32 #endif #if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64)

1 0

Alexandre Julliard : configure: Don't define _WIN32 for Cygwin builds.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 339950a7818e8d9b9ee504105513c159e0e89bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339950a7818e8d9b9ee50410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 11:07:56 2021 +0200 configure: Don't define _WIN32 for Cygwin builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- include/wine/port.h | 2 +- tools/tools.h | 6 +++--- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/configure b/configure index b61f1284ac4..56c78fc6295 100755 --- a/configure +++ b/configure @@ -5675,7 +5675,6 @@ case $host in *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} with_mingw=${with_mingw:-no} - CFLAGS="$CFLAGS -D_WIN32" ;; esac diff --git a/configure.ac b/configure.ac index f9caef8a857..af1cf7303ba 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,6 @@ case $host in *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} with_mingw=${with_mingw:-no} - CFLAGS="$CFLAGS -D_WIN32" ;; esac diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4cb738a6e2d..a02feb509e8 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -81,7 +81,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -122,7 +122,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index ac2ec619fbd..f352706c7f2 100644 --- a/include/windef.h +++ b/include/windef.h @@ -72,7 +72,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl diff --git a/include/wine/port.h b/include/wine/port.h index 00d3a8b5e3c..fda19f0ad4b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -43,7 +43,7 @@ * Hard-coded values for the Windows platform */ -#if defined(_WIN32) && !defined(__CYGWIN__) +#ifdef _WIN32 #include <errno.h> diff --git a/tools/tools.h b/tools/tools.h index cd87e20c163..f1240370b46 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -34,7 +34,7 @@ # include <unistd.h> #endif -#if defined(_WIN32) && !defined(__CYGWIN__) +#ifdef _WIN32 # include <direct.h> # include <io.h> # include <process.h> @@ -201,7 +201,7 @@ static inline struct strarray strarray_fromstring( const char *str, const char * static inline struct strarray strarray_frompath( const char *path ) { if (!path) return empty_strarray; -#if defined(_WIN32) && !defined(__CYGWIN__) +#ifdef _WIN32 return strarray_fromstring( path, ";" ); #else return strarray_fromstring( path, ":" ); @@ -253,7 +253,7 @@ static inline void strarray_trace( struct strarray args ) static inline int strarray_spawn( struct strarray args ) { -#if defined(_WIN32) && !defined(__CYGWIN__) +#ifdef _WIN32 strarray_add( &args, NULL ); return _spawnvp( _P_WAIT, args.str[0], args.str ); #else

1 0

Alexandre Julliard : configure: Add a __WINE_PE_BUILD define for files that are built as PE.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: cbf94a7b2c73d7c717a6e77c96a85f94f032e73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf94a7b2c73d7c717a6e77c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 11:07:10 2021 +0200 configure: Add a __WINE_PE_BUILD define for files that are built as PE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 ++++++----- configure.ac | 12 +++++------- dlls/winecrt0/crt_dllmain.c | 2 +- dlls/winecrt0/crt_fltused.c | 2 +- dlls/winecrt0/debug.c | 4 ++-- dlls/winecrt0/delay_load.c | 6 +++--- dlls/winecrt0/unix_lib.c | 4 ++-- include/config.h.in | 3 --- include/wine/asm.h | 14 +++++++------- 9 files changed, 27 insertions(+), 31 deletions(-) diff --git a/configure b/configure index d9dfe3e9c89..b61f1284ac4 100755 --- a/configure +++ b/configure @@ -630,7 +630,6 @@ LDAP_CFLAGS RT_LIBS TOOLSEXT MSVCRTFLAGS -EXTRACFLAGS VKD3D_SHADER_LIBS VKD3D_SHADER_CFLAGS VKD3D_LIBS @@ -751,6 +750,7 @@ TOP_INSTALL_DEV TOP_INSTALL_LIB UNIXLDFLAGS UNIXDLLFLAGS +EXTRACFLAGS LDEXECFLAGS LDDLLFLAGS DLLFLAGS @@ -7935,6 +7935,8 @@ LDDLLFLAGS="" LDEXECFLAGS="" +EXTRACFLAGS="" + UNIXDLLFLAGS="-fPIC" UNIXLDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname,\$(UNIXLIB)" @@ -8311,6 +8313,7 @@ else fi LIBEXT="dll" + EXTRACFLAGS="-D__WINE_PE_BUILD" case $host_cpu in *i[3456]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5 $as_echo_n "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; } @@ -9628,7 +9631,7 @@ test -n "$CROSSCC" || CROSSCC="false" saved_LDFLAGS=$LDFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} - EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" + EXTRACROSSCFLAGS="-D__WINE_PE_BUILD -Wall" @@ -16871,11 +16874,9 @@ fi test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} -EXTRACFLAGS="" - if test "x${GCC}" = "xyes" then - EXTRACFLAGS="-Wall -pipe" + EXTRACFLAGS="$EXTRACFLAGS -Wall -pipe" saved_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unknown-warning-option" >&5 diff --git a/configure.ac b/configure.ac index 44f8a1e2af6..f9caef8a857 100644 --- a/configure.ac +++ b/configure.ac @@ -696,6 +696,7 @@ dnl **** Check for working dll **** AC_SUBST(DLLFLAGS,"") AC_SUBST(LDDLLFLAGS,"") AC_SUBST(LDEXECFLAGS,"") +AC_SUBST(EXTRACFLAGS,"") AC_SUBST(UNIXDLLFLAGS,"-fPIC") AC_SUBST(UNIXLDFLAGS,["-shared -Wl,-Bsymbolic -Wl,-soname,\$(UNIXLIB)"]) AC_SUBST(TOP_INSTALL_LIB,"") @@ -715,6 +716,7 @@ case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) LIBEXT="dll" + EXTRACFLAGS="-D__WINE_PE_BUILD" dnl Disable stdcall fixups to catch prototype mismatches case $host_cpu in *i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup], @@ -953,7 +955,7 @@ then saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) - AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") + AC_SUBST(EXTRACROSSCFLAGS,"-D__WINE_PE_BUILD -Wall") AC_SUBST(CROSSLDFLAGS) CC="$CROSSCC" @@ -1955,10 +1957,9 @@ test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} dnl **** Check for gcc specific options **** -AC_SUBST(EXTRACFLAGS,"") if test "x${GCC}" = "xyes" then - EXTRACFLAGS="-Wall -pipe" + EXTRACFLAGS="$EXTRACFLAGS -Wall -pipe" dnl Check for some compiler flags dnl clang needs to be told to fail on unknown options @@ -2584,10 +2585,7 @@ esac dnl **** Generate output files **** AH_TOP([#ifndef __WINE_CONFIG_H -#define __WINE_CONFIG_H -#ifdef WINE_CROSS_PE -#error config.h should not be used when cross-compiling -#endif]) +#define __WINE_CONFIG_H]) AH_BOTTOM([#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/dlls/winecrt0/crt_dllmain.c b/dlls/winecrt0/crt_dllmain.c index b8b22eb1f24..181760c884a 100644 --- a/dlls/winecrt0/crt_dllmain.c +++ b/dlls/winecrt0/crt_dllmain.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD #include <stdarg.h> #include <stdio.h> diff --git a/dlls/winecrt0/crt_fltused.c b/dlls/winecrt0/crt_fltused.c index f65fc2d96c0..75abdfb3fa5 100644 --- a/dlls/winecrt0/crt_fltused.c +++ b/dlls/winecrt0/crt_fltused.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD /* referenced by MSVC to pull crt support for floating points. we don't use it. */ int _fltused = 0; diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index cb07c7835d4..14f3d2d3773 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD #include <stdio.h> #include <stdarg.h> @@ -249,4 +249,4 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ return p__wine_dbg_header( cls, channel, function ); } -#endif /* _WIN32 */ +#endif /* __WINE_PE_BUILD */ diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 1778856aa56..8f28c94d1d5 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -25,7 +25,7 @@ WINBASEAPI void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD extern IMAGE_DOS_HEADER __ImageBase; @@ -39,7 +39,7 @@ FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAG return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 ); } -#else /* _WIN32 */ +#else /* __WINE_PE_BUILD */ struct ImgDelayDescr { @@ -79,4 +79,4 @@ static void free_delay_imports(void) } #endif -#endif /* _WIN32 */ +#endif /* __WINE_PE_BUILD */ diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 584da22ab71..5239148e3aa 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD #include <stdarg.h> @@ -65,4 +65,4 @@ NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, vo return p__wine_unix_call( handle, code, args ); } -#endif /* _WIN32 */ +#endif /* __WINE_PE_BUILD */ diff --git a/include/config.h.in b/include/config.h.in index d616fb69a0d..f899dc27459 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,9 +2,6 @@ #ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifdef WINE_CROSS_PE -#error config.h should not be used when cross-compiling -#endif /* Define to the file extension for executables. */ #undef EXEEXT diff --git a/include/wine/asm.h b/include/wine/asm.h index da1d0d803cd..0547ee94b19 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -21,13 +21,13 @@ #ifndef __WINE_WINE_ASM_H #define __WINE_WINE_ASM_H -#if defined(__APPLE__) || (defined(_WIN32) && defined(__i386__)) +#if defined(__APPLE__) || (defined(__WINE_PE_BUILD) && defined(__i386__)) # define __ASM_NAME(name) "_" name #else # define __ASM_NAME(name) name #endif -#if defined(_WIN32) && defined(__i386__) +#if defined(__WINE_PE_BUILD) && defined(__i386__) # define __ASM_STDCALL(name,args) "_" name "@" #args # define __ASM_FASTCALL(name,args) "@" name "@" #args #else @@ -55,7 +55,7 @@ # define __ASM_SEH(str) #endif -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD # define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" @@ -67,7 +67,7 @@ # define __ASM_FUNC_TYPE(name) ".type " name ",@function" #endif -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD # define __ASM_FUNC_SIZE(name) "" #elif defined(__APPLE__) # define __ASM_FUNC_SIZE(name) "" @@ -107,7 +107,7 @@ __ASM_BLOCK_END #endif -#ifdef _WIN32 +#ifdef __WINE_PE_BUILD #define __ASM_GLOBAL_IMPORT(name) __ASM_DEFINE_IMPORT(__ASM_NAME(#name)) #define __ASM_STDCALL_IMPORT(name,args) __ASM_DEFINE_IMPORT(__ASM_STDCALL(#name,args)) #else @@ -117,7 +117,7 @@ /* fastcall support */ -#if defined(__i386__) && !defined(_WIN32) +#if defined(__i386__) && !defined(__WINE_PE_BUILD) # define __ASM_USE_FASTCALL_WRAPPER # define DEFINE_FASTCALL1_WRAPPER(func) \ @@ -176,7 +176,7 @@ #endif /* __i386__ */ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(__WINE_PE_BUILD) && !defined(__APPLE__) && !defined(__ANDROID__) #define __ASM_OBSOLETE(func) __asm__( ".symver " #func "_obsolete," #func "@WINE_1.0" ) #else #undef __ASM_OBSOLETE

1 0

Zebediah Figura : wined3d: Move the "memory_offset" field from struct wined3d_bo_vk to struct wined3d_bo.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: c53736d12fb0a03fa059d1ee10d1a34f5572aca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c53736d12fb0a03fa059d1ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 16:15:45 2021 -0500 wined3d: Move the "memory_offset" field from struct wined3d_bo_vk to struct wined3d_bo. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/context_gl.c | 1 + dlls/wined3d/context_vk.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fe738a4bcaa..8c3e63aac49 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -988,7 +988,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; range.memory = bo->vk_memory; - range.offset = bo->memory_offset + (uintptr_t)data->addr; + range.offset = bo->b.memory_offset + (uintptr_t)data->addr; range.size = size; VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); } @@ -1005,7 +1005,7 @@ map: return NULL; } - return (uint8_t *)map_ptr + bo->memory_offset + (uintptr_t)data->addr; + return (uint8_t *)map_ptr + bo->b.memory_offset + (uintptr_t)data->addr; } static void adapter_vk_unmap_bo_address(struct wined3d_context *context, @@ -1032,7 +1032,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, for (i = 0; i < range_count; ++i) { - range.offset = bo->memory_offset + ranges[i].offset; + range.offset = bo->b.memory_offset + ranges[i].offset; range.size = ranges[i].size; VK_CALL(vkFlushMappedMemoryRanges(device_vk->vk_device, 1, &range)); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 55782f1ba8e..b08003c697a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2889,6 +2889,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->coherent = coherent; list_init(&bo->b.users); bo->command_fence_id = 0; + bo->b.memory_offset = 0; return true; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ebd8bbece89..ad2f7adfe0b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -411,7 +411,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context bo->memory = NULL; bo->slab = slab; bo->buffer_offset = idx * object_size; - bo->memory_offset = slab->bo.memory_offset + bo->buffer_offset; + bo->b.memory_offset = slab->bo.b.memory_offset + bo->buffer_offset; bo->size = size; list_init(&bo->b.users); bo->command_buffer_id = 0; @@ -473,10 +473,10 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } - bo->memory_offset = bo->memory ? bo->memory->offset : 0; + bo->b.memory_offset = bo->memory ? bo->memory->offset : 0; if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, - bo->vk_memory, bo->memory_offset))) < 0) + bo->vk_memory, bo->b.memory_offset))) < 0) { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); if (bo->memory) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab262e3425c..161d36ad76c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1591,6 +1591,7 @@ do { \ struct wined3d_bo { struct list users; + size_t memory_offset; }; struct wined3d_bo_gl @@ -1630,7 +1631,6 @@ struct wined3d_bo_vk void *map_ptr; VkDeviceSize buffer_offset; - VkDeviceSize memory_offset; VkDeviceSize size; VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type;

1 0

Zebediah Figura : wined3d: Move the "users" field to a common wined3d_bo structure.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 59f16dd564175847244ad31eab729b481b0c198d URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f16dd564175847244ad31e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 16:15:44 2021 -0500 wined3d: Move the "users" field to a common wined3d_bo structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 8 ++++---- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 10 +++++----- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 11 +++++++++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5667cd8d0d3..fe738a4bcaa 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -939,13 +939,13 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) { bool host_synced = bo->host_synced; - list_move_head(&tmp.users, &bo->users); + list_move_head(&tmp.b.users, &bo->b.users); wined3d_context_vk_destroy_bo(context_vk, bo); *bo = tmp; bo->host_synced = host_synced; - list_init(&bo->users); - list_move_head(&bo->users, &tmp.users); - LIST_FOR_EACH_ENTRY(bo_user, &bo->users, struct wined3d_bo_user, entry) + list_init(&bo->b.users); + list_move_head(&bo->b.users, &tmp.b.users); + LIST_FOR_EACH_ENTRY(bo_user, &bo->b.users, struct wined3d_bo_user, entry) { bo_user->valid = false; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3ea3bf4b180..e1a5ec26c29 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -193,7 +193,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf return FALSE; } - list_add_head(&buffer_gl->bo.users, &buffer_gl->bo_user.entry); + list_add_head(&buffer_gl->bo.b.users, &buffer_gl->bo_user.entry); buffer_gl->b.buffer_object = (uintptr_t)bo; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); @@ -1429,7 +1429,7 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf } list_init(&buffer_vk->bo_user.entry); - list_add_head(&buffer_vk->bo.users, &buffer_vk->bo_user.entry); + list_add_head(&buffer_vk->bo.b.users, &buffer_vk->bo_user.entry); buffer_vk->b.buffer_object = (uintptr_t)&buffer_vk->bo; buffer_invalidate_bo_range(&buffer_vk->b, 0, 0); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0e4b900efe0..55782f1ba8e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2686,12 +2686,12 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, if (wined3d_context_gl_create_bo(context_gl, bo->size, bo->binding, bo->usage, bo->coherent, bo->flags, &tmp)) { - list_move_head(&tmp.users, &bo->users); + list_move_head(&tmp.b.users, &bo->b.users); wined3d_context_gl_destroy_bo(context_gl, bo); *bo = tmp; - list_init(&bo->users); - list_move_head(&bo->users, &tmp.users); - LIST_FOR_EACH_ENTRY(bo_user, &bo->users, struct wined3d_bo_user, entry) + list_init(&bo->b.users); + list_move_head(&bo->b.users, &tmp.b.users); + LIST_FOR_EACH_ENTRY(bo_user, &bo->b.users, struct wined3d_bo_user, entry) { bo_user->valid = false; } @@ -2887,7 +2887,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->usage = usage; bo->flags = flags; bo->coherent = coherent; - list_init(&bo->users); + list_init(&bo->b.users); bo->command_fence_id = 0; return true; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index af7b9fc1830..ebd8bbece89 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -413,7 +413,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context bo->buffer_offset = idx * object_size; bo->memory_offset = slab->bo.memory_offset + bo->buffer_offset; bo->size = size; - list_init(&bo->users); + list_init(&bo->b.users); bo->command_buffer_id = 0; bo->host_synced = false; @@ -492,7 +492,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; - list_init(&bo->users); + list_init(&bo->b.users); bo->command_buffer_id = 0; bo->slab = NULL; bo->host_synced = false; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 565d35d1c5a..a8b3a7b4f75 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -966,7 +966,7 @@ static void wined3d_shader_resource_view_gl_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_format); view_gl->bo_user.valid = true; - list_add_head(&wined3d_buffer_gl(buffer)->bo.users, &view_gl->bo_user.entry); + list_add_head(&wined3d_buffer_gl(buffer)->bo.b.users, &view_gl->bo_user.entry); context_release(context); } else @@ -1096,7 +1096,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) srv_vk->view_vk.u.vk_buffer_view = vk_buffer_view; srv_vk->view_vk.bo_user.valid = true; - list_add_head(&buffer_vk->bo.users, &srv_vk->view_vk.bo_user.entry); + list_add_head(&buffer_vk->bo.b.users, &srv_vk->view_vk.bo_user.entry); return; } @@ -1646,7 +1646,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); view_gl->bo_user.valid = true; - list_add_head(&wined3d_buffer_gl(buffer)->bo.users, &view_gl->bo_user.entry); + list_add_head(&wined3d_buffer_gl(buffer)->bo.b.users, &view_gl->bo_user.entry); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { struct wined3d_bo_gl *bo = &view_gl->counter_bo; @@ -2196,7 +2196,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; uav_vk->view_vk.bo_user.valid = true; - list_add_head(&buffer_vk->bo.users, &view_vk->bo_user.entry); + list_add_head(&buffer_vk->bo.b.users, &view_vk->bo_user.entry); } if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0884ba5c023..ab262e3425c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1588,8 +1588,15 @@ do { \ #define checkGLcall(A) do {} while(0) #endif +struct wined3d_bo +{ + struct list users; +}; + struct wined3d_bo_gl { + struct wined3d_bo b; + GLuint id; GLsizeiptr size; GLenum binding; @@ -1597,7 +1604,6 @@ struct wined3d_bo_gl GLbitfield flags; bool coherent; - struct list users; uint64_t command_fence_id; }; @@ -1614,6 +1620,8 @@ struct wined3d_bo_user struct wined3d_bo_vk { + struct wined3d_bo b; + VkBuffer vk_buffer; struct wined3d_allocator_block *memory; struct wined3d_bo_slab_vk *slab; @@ -1627,7 +1635,6 @@ struct wined3d_bo_vk VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type; - struct list users; uint64_t command_buffer_id; bool host_synced; };

1 0

Zebediah Figura : wined3d: Return the map pitch from the map_upload_bo() callbacks.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 3a8a9a678d04bcdbd82f6c6912704c92412424f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8a9a678d04bcdbd82f6c69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 16:15:43 2021 -0500 wined3d: Return the map pitch from the map_upload_bo() callbacks. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 78 +++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 159b9ae05a9..f828a2e045d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2493,25 +2493,18 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { - unsigned int row_pitch, slice_pitch; struct wined3d_cs_map *op; - void *map_ptr; HRESULT hr; /* Mapping resources from the worker thread isn't an issue by itself, but * increasing the map count would be visible to applications. */ wined3d_not_from_cs(context->device->cs); - wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - && (map_ptr = context->ops->map_upload_bo(context, resource, - sub_resource_idx, box, row_pitch, slice_pitch, flags))) + && context->ops->map_upload_bo(context, resource, sub_resource_idx, map_desc, box, flags)) { - TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", map_ptr, row_pitch, slice_pitch); - map_desc->data = map_ptr; - map_desc->row_pitch = row_pitch; - map_desc->slice_pitch = slice_pitch; + TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", + map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); return WINED3D_OK; } @@ -2522,7 +2515,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; - op->map_ptr = &map_ptr; + op->map_ptr = &map_desc->data; op->box = box; op->flags = flags; op->hr = &hr; @@ -2530,12 +2523,9 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); - if (FAILED(hr)) - return hr; - - map_desc->data = map_ptr; - map_desc->row_pitch = row_pitch; - map_desc->slice_pitch = slice_pitch; + if (SUCCEEDED(hr)) + wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, + &map_desc->row_pitch, &map_desc->slice_pitch); return hr; } @@ -2771,17 +2761,17 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte const void *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_cs_update_sub_resource *op; + struct wined3d_map_desc map_desc; struct wined3d_box dummy_box; struct upload_bo bo; - void *map_ptr; - if ((map_ptr = context->ops->map_upload_bo(context, resource, sub_resource_idx, box, - row_pitch, slice_pitch, WINED3D_MAP_WRITE))) + if (context->ops->map_upload_bo(context, resource, sub_resource_idx, &map_desc, box, WINED3D_MAP_WRITE)) { - wined3d_format_copy_data(resource->format, data, row_pitch, slice_pitch, map_ptr, row_pitch, slice_pitch, - box->right - box->left, box->bottom - box->top, box->back - box->front); + wined3d_format_copy_data(resource->format, data, row_pitch, slice_pitch, map_desc.data, map_desc.row_pitch, + map_desc.slice_pitch, box->right - box->left, box->bottom - box->top, box->back - box->front); context->ops->unmap_upload_bo(context, resource, sub_resource_idx, &dummy_box, &bo); - wined3d_device_context_upload_bo(context, resource, sub_resource_idx, box, &bo, row_pitch, slice_pitch); + wined3d_device_context_upload_bo(context, resource, sub_resource_idx, + box, &bo, map_desc.row_pitch, map_desc.slice_pitch); return; } @@ -3095,12 +3085,11 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi { } -static void *wined3d_cs_map_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, - unsigned int slice_pitch, uint32_t flags) +static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { /* FIXME: We would like to return mapped or newly allocated memory here. */ - return NULL; + return false; } static bool wined3d_cs_unmap_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, @@ -3540,9 +3529,9 @@ static struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3 return NULL; } -static void *wined3d_deferred_context_map_upload_bo(struct wined3d_device_context *context, - struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, - unsigned int row_pitch, unsigned int slice_pitch, uint32_t flags) +static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); const struct wined3d_format *format = resource->format; @@ -3550,39 +3539,41 @@ static void *wined3d_deferred_context_map_upload_bo(struct wined3d_device_contex uint8_t *sysmem; size_t size; - size = (box->back - box->front - 1) * slice_pitch - + ((box->bottom - box->top - 1) / format->block_height) * row_pitch + wined3d_format_calculate_pitch(format, 1, box->right - box->left, + box->bottom - box->top, &map_desc->row_pitch, &map_desc->slice_pitch); + + size = (box->back - box->front - 1) * map_desc->slice_pitch + + ((box->bottom - box->top - 1) / format->block_height) * map_desc->row_pitch + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count; if (!(flags & WINED3D_MAP_WRITE)) { WARN("Flags %#x are not valid on a deferred context.\n", flags); - return NULL; + return false; } if (flags & ~(WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { FIXME("Unhandled flags %#x.\n", flags); - return NULL; + return false; } if (flags & WINED3D_MAP_NOOVERWRITE) { - if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) - { - upload->upload_flags = 0; - return (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); - } + if (!(upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) + return false; - return NULL; + upload->upload_flags = 0; + map_desc->data = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + return true; } if (!wined3d_array_reserve((void **)&deferred->uploads, &deferred->uploads_capacity, deferred->upload_count + 1, sizeof(*deferred->uploads))) - return NULL; + return false; if (!(sysmem = heap_alloc(size + RESOURCE_ALIGNMENT - 1))) - return NULL; + return false; upload = &deferred->uploads[deferred->upload_count++]; upload->upload_flags = UPLOAD_BO_UPLOAD_ON_UNMAP; @@ -3592,7 +3583,8 @@ static void *wined3d_deferred_context_map_upload_bo(struct wined3d_device_contex upload->sysmem = sysmem; upload->box = *box; - return (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + map_desc->data = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + return true; } static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2899e6a778..0884ba5c023 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4776,9 +4776,9 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); - void *(*map_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, unsigned int row_pitch, - unsigned int slice_pitch, uint32_t flags); + bool (*map_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, + const struct wined3d_box *box, uint32_t flags); bool (*unmap_upload_bo)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *upload_bo); void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021