- Wine-Commits - list.winehq.org

Elizabeth Figura : wined3d: Remove the no longer used STATE_SAMPLER.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: wine Branch: master Commit: 870f1b02f952d5b4a0507b3a2b80e193247b607d URL: https://gitlab.winehq.org/wine/wine/-/commit/870f1b02f952d5b4a0507b3a2b80e1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Apr 26 17:20:12 2024 -0500 wined3d: Remove the no longer used STATE_SAMPLER. --- dlls/wined3d/adapter_vk.c | 21 --------------------- dlls/wined3d/context_gl.c | 6 ------ dlls/wined3d/cs.c | 11 ----------- dlls/wined3d/directx.c | 21 --------------------- dlls/wined3d/ffp_gl.c | 25 ------------------------- dlls/wined3d/texture.c | 15 --------------- dlls/wined3d/utils.c | 2 -- dlls/wined3d/view.c | 6 ------ dlls/wined3d/wined3d_private.h | 6 +----- 9 files changed, 1 insertion(+), 112 deletions(-)

1 0

Jacek Caban : ntdll: Use assembly wrapper for unixlib calls on ARM64EC.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: wine Branch: master Commit: 434702fdc94480648c0a2036f682ef3dc1f8d48c URL: https://gitlab.winehq.org/wine/wine/-/commit/434702fdc94480648c0a2036f682ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 13:03:22 2024 +0200 ntdll: Use assembly wrapper for unixlib calls on ARM64EC. Instead of using indirect C calls, which need to go through the call dispatcher. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64ec.c | 17 ++++++++++++++++- dlls/ntdll/unix/loader.c | 13 ++++++++++++- dlls/winecrt0/unix_lib.c | 25 +++++++++++++++++++++++++ include/wine/unixlib.h | 8 ++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d32c95c49ad..2d2ec919c5c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1723,6 +1723,7 @@ @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher @ extern -private __wine_unix_call_dispatcher +@ extern -private -arch=arm64ec __wine_unix_call_dispatcher_arm64ec @ extern -private __wine_unixlib_handle # Debugging diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8caf4218ab9..a79996f8b48 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2227,6 +2227,22 @@ ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) } +/************************************************************************* + * __wine_unix_call_arm64ec + */ +NTSTATUS __attribute__((naked)) __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + asm( ".seh_proc \"#__wine_unix_call_arm64ec\"\n\t" + ".seh_endprologue\n\t" + "adrp x16, __wine_unix_call_dispatcher_arm64ec\n\t" + "ldr x16, [x16, #:lo12:__wine_unix_call_dispatcher_arm64ec]\n\t" + "br x16\n\t" + ".seh_endproc" ); +} + +NTSTATUS (WINAPI *__wine_unix_call_dispatcher_arm64ec)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call_arm64ec; + + static int code_match( BYTE *code, const BYTE *seq, size_t len ) { for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; @@ -2262,7 +2278,6 @@ void *check_call( void **target, void *exit_thunk, void *dest ) for (;;) { - if (dest == __wine_unix_call_dispatcher) return dest; if (RtlIsEcCode( (ULONG_PTR)dest )) return dest; if (code_match( dest, jmp_sequence, sizeof(jmp_sequence) )) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 06959fa95df..9d866fa70f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1517,6 +1517,7 @@ static void load_ntdll_functions( HMODULE module ) { void **p__wine_syscall_dispatcher; void **p__wine_unix_call_dispatcher; + void **p__wine_unix_call_dispatcher_arm64ec = NULL; unixlib_handle_t *p__wine_unixlib_handle; const IMAGE_EXPORT_DIRECTORY *exports; @@ -1539,9 +1540,19 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( __wine_syscall_dispatcher ); GET_FUNC( __wine_unix_call_dispatcher ); GET_FUNC( __wine_unixlib_handle ); + if (is_arm64ec()) + { + GET_FUNC( __wine_unix_call_dispatcher_arm64ec ); + } *p__wine_syscall_dispatcher = __wine_syscall_dispatcher; - *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; + if (p__wine_unix_call_dispatcher_arm64ec) + { + /* redirect __wine_unix_call_dispatcher to __wine_unix_call_dispatcher_arm64ec */ + *p__wine_unix_call_dispatcher = *p__wine_unix_call_dispatcher_arm64ec; + *p__wine_unix_call_dispatcher_arm64ec = __wine_unix_call_dispatcher; + } + else *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; #undef GET_FUNC } diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index fd5087cbe48..ebf6594e770 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -64,6 +64,31 @@ static NTSTATUS WINAPI unix_call_init( unixlib_handle_t handle, unsigned int cod unixlib_handle_t __wine_unixlib_handle = 0; NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_init; +#ifdef __arm64ec__ + +static NTSTATUS WINAPI unix_call_init_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ); + +static __attribute__((used)) NTSTATUS (WINAPI *__wine_unix_call_dispatcher_arm64ec)( unixlib_handle_t, unsigned int, void * ) = unix_call_init_arm64ec; + +static NTSTATUS WINAPI unix_call_init_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + InterlockedExchangePointer( (void **)&__wine_unix_call_dispatcher_arm64ec, + get_dispatcher( "__wine_unix_call_dispatcher_arm64ec" )); + return __wine_unix_call_arm64ec( handle, code, args ); +} + +NTSTATUS __attribute__((naked)) __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + asm( ".seh_proc \"#__wine_unix_call_arm64ec\"\n\t" + ".seh_endprologue\n\t" + "adrp x16, __wine_unix_call_dispatcher_arm64ec\n\t" + "ldr x16, [x16, #:lo12:__wine_unix_call_dispatcher_arm64ec]\n\t" + "br x16\n\t" + ".seh_endproc" ); +} + +#endif + NTSTATUS WINAPI __wine_init_unix_call(void) { return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 17ec93110f2..9a342fada73 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -262,10 +262,18 @@ extern unixlib_handle_t __wine_unixlib_handle; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ); extern NTSTATUS WINAPI __wine_init_unix_call(void); +#ifdef __arm64ec__ +NTSTATUS __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ); +static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return __wine_unix_call_arm64ec( handle, code, args ); +} +#else static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return __wine_unix_call_dispatcher( handle, code, args ); } +#endif #define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) )

1 0

Victor Chiletto : vkd3d-shader/preproc: Treat CR as whitespace.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: vkd3d Branch: master Commit: 105ef282736090c034599ecbe5abca56ea6d05a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/105ef282736090c034599ecbe5abc… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed May 22 14:07:00 2024 -0300 vkd3d-shader/preproc: Treat CR as whitespace. --- libs/vkd3d-shader/preproc.l | 2 +- tests/hlsl_d3d12.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index d360f6ca..be50d3b9 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -65,7 +65,7 @@ static void update_location(struct preproc_ctx *ctx); %s LINE NEWLINE \r?\n -WS [ \t] +WS [ \t\r] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* INT_SUFFIX [uUlL]{0,2} diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 8d5d8d90..215d624a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -379,6 +379,18 @@ static void test_preprocess(void) "pass", "fail", }, + + /* CRs are treated as whitespace. */ + { + "#define\rKEY(a,\rb)\ra##b\r\n" + "KEY(pa,\rss)\r\n" + "#ifndef\rKEY\r\n" + "fail\r\n" + "#endif\r\n", + + "pass", + "fail", + } }; for (i = 0; i < ARRAY_SIZE(tests); ++i)

1 0

Alexandre Julliard : ntdll: Make __wine_unix_call() an inline function.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: wine Branch: master Commit: 127650c293b5716c6a1f2028185c3f3fe8c6598c URL: https://gitlab.winehq.org/wine/wine/-/commit/127650c293b5716c6a1f2028185c3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:54:55 2024 +0200 ntdll: Make __wine_unix_call() an inline function. --- dlls/ntdll/loader.c | 11 +---------- dlls/ntdll/ntdll.spec | 1 - dlls/win32u/main.c | 8 +++----- include/wine/unixlib.h | 8 ++++++-- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6e3f67ef593..31bfe60d121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -70,7 +70,7 @@ typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *); void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; -NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = NULL; static DWORD (WINAPI *pCtrlRoutine)(void *); @@ -3314,15 +3314,6 @@ NTSTATUS WINAPI __wine_ctrl_routine( void *arg ) } -/*********************************************************************** - * __wine_unix_call - */ -NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) -{ - return __wine_unix_call_dispatcher( handle, code, args ); -} - - /*********************************************************************** * __wine_unix_spawnvp */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13043130cf6..d32c95c49ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1719,7 +1719,6 @@ @ cdecl wine_server_handle_to_fd(long long ptr ptr) # Unix interface -@ stdcall __wine_unix_call(int64 long ptr) @ stdcall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index 28383161b6f..8e32fc63556 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -33,8 +33,6 @@ void *__wine_syscall_dispatcher = NULL; -static unixlib_handle_t win32u_handle; - /******************************************************************* * syscalls */ @@ -2192,6 +2190,8 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun for (;;) RtlRaiseException( &record ); } +void *dummy = NtQueryVirtualMemory; /* forced import to avoid link error with winecrt0 */ + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { HMODULE ntdll; @@ -2206,9 +2206,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) LdrGetDllHandle( NULL, 0, &ntdll_name, &ntdll ); dispatcher_ptr = RtlFindExportedRoutineByName( ntdll, "__wine_syscall_dispatcher" ); __wine_syscall_dispatcher = *dispatcher_ptr; - if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, - &win32u_handle, sizeof(win32u_handle), NULL )) - __wine_unix_call( win32u_handle, 0, NULL ); + if (!__wine_init_unix_call()) WINE_UNIX_CALL( 0, NULL ); break; } return TRUE; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 95ff406d968..17ec93110f2 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -258,12 +258,16 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ -NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); extern unixlib_handle_t __wine_unixlib_handle; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ); extern NTSTATUS WINAPI __wine_init_unix_call(void); -#define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) ) +static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return __wine_unix_call_dispatcher( handle, code, args ); +} + +#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) #endif /* WINE_UNIX_LIB */

1 0

Alexandre Julliard : winecrt0: Initialize the Unix call dispatcher on first use.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: wine Branch: master Commit: 455a3c1796d9a1bc9c049637c37b50fabc48488f URL: https://gitlab.winehq.org/wine/wine/-/commit/455a3c1796d9a1bc9c049637c37b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:46:59 2024 +0200 winecrt0: Initialize the Unix call dispatcher on first use. --- dlls/winecrt0/unix_lib.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 5b809b6949d..fd5087cbe48 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -43,18 +43,29 @@ static NTSTATUS WINAPI unix_call_fallback( unixlib_handle_t handle, unsigned int return STATUS_DLL_NOT_FOUND; } +static inline void *get_dispatcher( const char *name ) +{ + UNICODE_STRING ntdll_name = RTL_CONSTANT_STRING( L"ntdll.dll" ); + HMODULE module; + void **dispatcher; + + LdrGetDllHandle( NULL, 0, &ntdll_name, &module ); + dispatcher = RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ); + return dispatcher ? *dispatcher : (void *)unix_call_fallback; +} + +static NTSTATUS WINAPI unix_call_init( unixlib_handle_t handle, unsigned int code, void *args ) +{ + InterlockedExchangePointer( (void **)&__wine_unix_call_dispatcher, + get_dispatcher( "__wine_unix_call_dispatcher" )); + return __wine_unix_call_dispatcher( handle, code, args ); +} + unixlib_handle_t __wine_unixlib_handle = 0; -NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_fallback; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_init; NTSTATUS WINAPI __wine_init_unix_call(void) { - NTSTATUS status; - HMODULE module = GetModuleHandleW( L"ntdll.dll" ); - void **p__wine_unix_call_dispatcher = (void **)GetProcAddress( module, "__wine_unix_call_dispatcher" ); - - if (!p__wine_unix_call_dispatcher) return STATUS_DLL_NOT_FOUND; - status = NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, - &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); - if (!status) __wine_unix_call_dispatcher = *p__wine_unix_call_dispatcher; - return status; + return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); }

1 0

Alexandre Julliard : msvcp/tests: Fix mangled names on ARM.
by Alexandre Julliard May 23, 2024

May 23, 2024

Module: wine Branch: master Commit: 57bb483be85adbfcc6e39f317cd10da8cf47ee5f URL: https://gitlab.winehq.org/wine/wine/-/commit/57bb483be85adbfcc6e39f317cd10d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 12:20:35 2024 +0200 msvcp/tests: Fix mangled names on ARM. --- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f3cce632f51..c7de814a384 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -769,7 +769,7 @@ static BOOL init(void) SET(p_vector_base_v4__Internal_reserve, "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXIII(a)Z"); SET(p_vector_base_v4__Internal_resize, - "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); + "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); #endif } SET(p__Thrd_equal, diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8966820f599..faf4c214801 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -299,7 +299,7 @@ static BOOL init(void) SET(p__ContextCallback__Capture, "?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); SET(p__ContextCallback__Reset, "?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); SET(p__TaskEventLogger__LogCancelTask, "?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); - SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z"); + SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z@Z"); SET(p__TaskEventLogger__LogTaskCompleted, "?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); SET(p__TaskEventLogger__LogTaskExecutionCompleted, "?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); SET(p__TaskEventLogger__LogWorkItemCompleted, "?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ");

1 0

Giovanni Mascellani : tests: Check device support for all the 16 bit image formats.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: a64426edf9fa0e36cbe982656dc606bf1e02822f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a64426edf9fa0e36cbe982656dc60… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 21 13:40:48 2024 +0200 tests: Check device support for all the 16 bit image formats. Otherwise the test crash on llvmpipe. --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index bbfa51e5..26b6e2b8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5791,10 +5791,10 @@ static void test_clear_unordered_access_view_image(void) 0x00000380, true}, {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* -1.0f */, 0}, - 0x87ff, true}, + 0x87ff, true, false, true}, {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3e800000 /* 0.25f */, 0x3e000000 /* 0.125f */, 0x3f800000 /* 1.0f */}, - 0xc104, true}, + 0xc104, true, false, true}, {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0x40000000 /* -1.0f */}, 0xf8ff, true, false, true},

1 0

Giovanni Mascellani : vkd3d: Move the full stops before the newline.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: dfa3ee25e039d1ac1a046406c74a2e589d6f28c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfa3ee25e039d1ac1a046406c74a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 21 13:35:18 2024 +0200 vkd3d: Move the full stops before the newline. --- libs/vkd3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8b817264..cfc9c5f5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1334,11 +1334,11 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev fragment_shader_interlock_features = &info->fragment_shader_interlock_features; TRACE(" VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT:\n"); - TRACE(" fragmentShaderSampleInterlock: %#x.\n.", + TRACE(" fragmentShaderSampleInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderSampleInterlock); - TRACE(" fragmentShaderPixelInterlock: %#x\n.", + TRACE(" fragmentShaderPixelInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderPixelInterlock); - TRACE(" fragmentShaderShadingRateInterlock: %#x\n.", + TRACE(" fragmentShaderShadingRateInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderShadingRateInterlock); demote_features = &info->demote_features;

1 0

Victor Chiletto : vkd3d-shader/hlsl: Fix XOR assign operator lexing.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: fa5708d3b554d9534c1fcad0d7d1eae3a535cec1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa5708d3b554d9534c1fcad0d7d1e… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon May 20 14:18:04 2024 -0300 vkd3d-shader/hlsl: Fix XOR assign operator lexing. --- libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/bitwise.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 88b917ef..a5923d8b 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -191,7 +191,7 @@ while {return KW_WHILE; } %= {return OP_MODASSIGN; } &= {return OP_ANDASSIGN; } \|= {return OP_ORASSIGN; } -^= {return OP_XORASSIGN; } +\^= {return OP_XORASSIGN; } {IDENTIFIER} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 008ddce3..63971f52 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -96,7 +96,7 @@ float4 main() : SV_TARGET todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 main() : SV_TARGET { int a = 0; @@ -113,7 +113,7 @@ float4 main() : SV_TARGET } [test] -todo(glsl|sm<6) draw quad +todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) [pixel shader]

1 0

Victor Chiletto : tests/hlsl: Add a test for the XOR assign operator.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: d8d2414132f5a84c44ee3492dd59fa5f00c6c8a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8d2414132f5a84c44ee3492dd59f… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon May 20 13:45:41 2024 -0300 tests/hlsl: Add a test for the XOR assign operator. --- tests/hlsl/bitwise.shader_test | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 03b4282c..008ddce3 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -96,6 +96,26 @@ float4 main() : SV_TARGET todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) +[pixel shader todo(sm<6)] +float4 main() : SV_TARGET +{ + int a = 0; + int b = 0; + int c = 1; + int d = 1; + + a ^= 0; + b ^= 1; + c ^= 0; + d ^= 1; + + return float4(a, b, c, d); +} + +[test] +todo(glsl|sm<6) draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) + [pixel shader] float4 main() : SV_TARGET {

1 0