- Wine-Commits - list.winehq.org

Aida Jonikienė : msvcp140_atomic_wait: Implement __std_*_crt().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: efce36004de600662876fb57389c9488b9c863bc URL: https://gitlab.winehq.org/wine/wine/-/commit/efce36004de600662876fb57389c94… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Thu May 2 02:02:36 2024 +0300 msvcp140_atomic_wait: Implement __std_*_crt(). OpenImageViewer calls these functions when triggering the image properties menu. --- dlls/msvcp140_atomic_wait/main.c | 10 ++++++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index b7aa30200ff..52ecae486eb 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -165,3 +165,13 @@ void __stdcall __std_release_shared_mutex_for_instance(void *ptr) } LeaveCriticalSection(&shared_mutex_cs); } + +void* __stdcall __std_calloc_crt(size_t count, size_t size) +{ + return calloc(count, size); +} + +void __stdcall __std_free_crt(void *ptr) +{ + free(ptr); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 5d9dd5c1a74..88ed59adad9 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -12,12 +12,12 @@ @ stub __std_atomic_wait_get_remaining_timeout @ stub __std_atomic_wait_indirect @ stdcall __std_bulk_submit_threadpool_work(ptr long) -@ stub __std_calloc_crt +@ stdcall __std_calloc_crt(long long) @ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all -@ stub __std_free_crt +@ stdcall __std_free_crt(ptr) @ stdcall __std_parallel_algorithms_hw_threads() @ stdcall __std_release_shared_mutex_for_instance(ptr) @ stdcall __std_submit_threadpool_work(ptr)

1 0

Anton Baskanov : winex11.drv: Process RRNotify events in xrandr14_get_id.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: b3eb55227aef198a637f80a2fa0bce74aa0a7190 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3eb55227aef198a637f80a2fa0bce… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Feb 9 14:37:20 2024 +0700 winex11.drv: Process RRNotify events in xrandr14_get_id. We have to invalidate the current mode cache if there are pending RRNotify events. The performance hit on EnumDisplaySettingsExW is around 7%. Also call X11DRV_DisplayDevices_RegisterEventHandlers in x11drv_init. Otherwise, RRNotify events will only be handled in the explorer process. --- dlls/user32/tests/monitor.c | 10 +++++----- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xrandr.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 63c1e4a1271..c638e1cbfef 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1258,7 +1258,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event1); wait_result = WaitForSingleObject(process1, 5000); @@ -1300,7 +1300,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event1); wait_result = WaitForSingleObject(process1, 5000); @@ -1310,7 +1310,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); CloseHandle(process1); CloseHandle(process0); @@ -1328,7 +1328,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event0); wait_result = WaitForSingleObject(process0, 5000); @@ -1338,7 +1338,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); CloseHandle(process1); CloseHandle(process0); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 379b27b3f70..2070d942056 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -405,7 +405,7 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) /*********************************************************************** * process_events */ -static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) +BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 957a46dba86..68b34fa868d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2093,7 +2093,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) CWOverrideRedirect | CWEventMask, &attr ); XFlush( data->display ); NtUserSetProp( hwnd, clip_window_prop, (HANDLE)data->clip_window ); - X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1e13122076c..0ccffecec49 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -679,6 +679,7 @@ extern void retry_grab_clipping_window(void); extern void ungrab_clipping_window(void); extern void move_resize_window( HWND hwnd, int dir ); extern void X11DRV_InitKeyboard( Display *display ); +extern BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*, XPointer), ULONG_PTR arg ); extern BOOL X11DRV_ProcessEvents( DWORD mask ); extern HWND *build_hwnd_list(void); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 180573128e7..dc94ee84ccc 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -683,6 +683,7 @@ static NTSTATUS x11drv_init( void *arg ) init_user_driver(); X11DRV_DisplayDevices_Init(FALSE); + X11DRV_DisplayDevices_RegisterEventHandlers(); return STATUS_SUCCESS; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 002ab77c086..c161b119cc9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1220,6 +1220,32 @@ static void xrandr14_register_event_handlers(void) "XRandR ProviderChange" ); } +static Bool filter_rrnotify_event( Display *display, XEvent *event, char *arg ) +{ + ULONG_PTR event_base = (ULONG_PTR)arg; + + if (event->type == event_base + RRNotify_CrtcChange + || event->type == event_base + RRNotify_OutputChange + || event->type == event_base + RRNotify_ProviderChange) + return 1; + + return 0; +} + +static void process_rrnotify_events(void) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int event_base, error_base; + + if (!data) return; + if (data->current_event) return; /* don't process nested events */ + + if (!pXRRQueryExtension( data->display, &event_base, &error_base )) + return; + + process_events( data->display, filter_rrnotify_event, event_base ); +} + /* XRandR 1.4 display settings handler */ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_settings_id *id ) { @@ -1235,6 +1261,8 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_s if (*end) return FALSE; + process_rrnotify_events(); + /* Update cache */ pthread_mutex_lock( &xrandr_mutex ); if (!current_modes)

1 0

Anton Baskanov : explorer: Restore display settings on process exit.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 89ad36b1d96fdd64cb2e59bd5743716b5874dac9 URL: https://gitlab.winehq.org/wine/wine/-/commit/89ad36b1d96fdd64cb2e59bd574371… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 6 20:59:57 2024 +0700 explorer: Restore display settings on process exit. Restore display settings to the ones in the registry when CDS_FULLSCREEN is used in ChangeDisplaySettings(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49674 --- dlls/user32/tests/monitor.c | 50 ++++++++++----------- dlls/win32u/sysparams.c | 13 ++++++ programs/explorer/desktop.c | 105 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 136 insertions(+), 32 deletions(-)

1 0

Anton Baskanov : user32/tests: Test that display settings are restored on process exit.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 30c3d0a3373db51f978b846fe90551ee2fe2b9d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c3d0a3373db51f978b846fe90551… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 6 16:52:24 2024 +0700 user32/tests: Test that display settings are restored on process exit. --- dlls/user32/tests/monitor.c | 308 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 290 insertions(+), 18 deletions(-)

1 0

Alex Henrie : pdh: Add PdhConnectMachineA stub.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 30019a5b8759c2d56ac82fe7454bda09cca77b63 URL: https://gitlab.winehq.org/wine/wine/-/commit/30019a5b8759c2d56ac82fe7454bda… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 1 21:40:18 2024 -0600 pdh: Add PdhConnectMachineA stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56599 --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 711c970029b..3d51f6257ef 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -18,7 +18,7 @@ @ stdcall PdhCollectQueryDataWithTime(ptr ptr) @ stdcall PdhCollectQueryDataEx(ptr long ptr) @ stub PdhComputeCounterStatistics -@ stub PdhConnectMachineA +@ stdcall PdhConnectMachineA(str) @ stub PdhConnectMachineW @ stub PdhCreateSQLTablesA @ stub PdhCreateSQLTablesW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 12bda6bedc0..dec86a9962b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1280,3 +1280,12 @@ PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenam FIXME("%p %s: stub\n", source, debugstr_w(filenamelist)); return PDH_NOT_IMPLEMENTED; } + +/*********************************************************************** + * PdhConnectMachineA (PDH.@) + */ +PDH_STATUS WINAPI PdhConnectMachineA(const char *name) +{ + FIXME("%s: stub\n", debugstr_a(name)); + return PDH_NOT_IMPLEMENTED; +}

1 0

Alex Henrie : shell32: Add SHAssocEnumHandlersForProtocolByApplication stub.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 0af35ccd06c30cd09d378599efe33a2bb7238b4f URL: https://gitlab.winehq.org/wine/wine/-/commit/0af35ccd06c30cd09d378599efe33a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 1 22:15:25 2024 -0600 shell32: Add SHAssocEnumHandlersForProtocolByApplication stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56581 --- dlls/shell32/assoc.c | 9 +++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 37cdc01101a..45e9781d078 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1132,3 +1132,12 @@ HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnu *enumhandlers = &enumassoc->IEnumAssocHandlers_iface; return S_OK; } + +/************************************************************************** + * SHAssocEnumHandlersForProtocolByApplication [SHELL32.@] + */ +HRESULT WINAPI SHAssocEnumHandlersForProtocolByApplication(const WCHAR *protocol, REFIID riid, void **handlers) +{ + FIXME("(%s %s %p): stub\n", debugstr_w(protocol), debugstr_guid(riid), handlers); + return E_NOTIMPL; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 8155365318d..bdf3378a235 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHAssocEnumHandlersForProtocolByApplication(wstr ptr ptr) @ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr)

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVE_ANY_TRUE instruction.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 95489899bee957a4654a0516007cdf238ab93cdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/95489899bee957a4654a0516007cd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:37:25 2024 +1000 vkd3d-shader/spirv: Handle the WAVE_ANY_TRUE instruction. --- libs/vkd3d-shader/spirv.c | 3 +++ tests/hlsl/wave-ops-float.shader_test | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 848d4e4d..0a52e1a7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9766,6 +9766,8 @@ static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode handler_idx) return SpvOpGroupNonUniformAllEqual; case VKD3DSIH_WAVE_ALL_TRUE: return SpvOpGroupNonUniformAll; + case VKD3DSIH_WAVE_ANY_TRUE: + return SpvOpGroupNonUniformAny; default: vkd3d_unreachable(); } @@ -10137,6 +10139,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: case VKD3DSIH_WAVE_ALL_TRUE: + case VKD3DSIH_WAVE_ANY_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; case VKD3DSIH_DCL: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 09e7937e..b0fdcb6c 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -58,7 +58,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbaui (1, 1, 0, 0) probe uav 1 (1) rgbaui (1, 1, 0, 0) probe uav 1 (2) rgbaui (1, 1, 0, 0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveAnyTrue.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: fb5eb3159d7fb274e0823f45d3c3ca3a63473fa1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb5eb3159d7fb274e0823f45d3c3c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:32:52 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveAnyTrue. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 6e7a5306..b2f329cd 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -329,6 +329,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", + [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 33646e75..e636ad91 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ANY_TRUE = 113, DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, @@ -4518,6 +4519,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; case DX_WAVE_ALL_TRUE: return VKD3DSIH_WAVE_ALL_TRUE; + case DX_WAVE_ANY_TRUE: + return VKD3DSIH_WAVE_ANY_TRUE; default: vkd3d_unreachable(); } @@ -6049,6 +6052,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, + [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 74ffdd57..b0e52a33 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -529,6 +529,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, VKD3DSIH_WAVE_ALL_TRUE, + VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the WAVE_ALL_TRUE instruction.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 77ec2a5caa745525709d4db4d9d48f09ed09bac3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/77ec2a5caa745525709d4db4d9d48… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:36:03 2024 +1000 vkd3d-shader/spirv: Handle the WAVE_ALL_TRUE instruction. --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b7b4c3ec..848d4e4d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9764,6 +9764,8 @@ static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode handler_idx) { case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: return SpvOpGroupNonUniformAllEqual; + case VKD3DSIH_WAVE_ALL_TRUE: + return SpvOpGroupNonUniformAll; default: vkd3d_unreachable(); } @@ -10134,6 +10136,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, spirv_compiler_emit_cut_stream(compiler, instruction); break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: + case VKD3DSIH_WAVE_ALL_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; case VKD3DSIH_DCL:

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveAllTrue.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 8e2b35153803565fc93b878b25fedc668ecbb4b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e2b35153803565fc93b878b25fed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 11:32:52 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveAllTrue. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 51de7ecd..6e7a5306 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -328,6 +328,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOF ] = "utof", [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", + [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_XOR ] = "xor", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c1e3976f..33646e75 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -429,6 +429,7 @@ enum dx_intrinsic_opcode DX_PRIMITIVE_ID = 108, DX_WAVE_GET_LANE_INDEX = 111, DX_WAVE_GET_LANE_COUNT = 112, + DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -4515,6 +4516,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_F16TOF32; case DX_WAVE_ACTIVE_ALL_EQUAL: return VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL; + case DX_WAVE_ALL_TRUE: + return VKD3DSIH_WAVE_ALL_TRUE; default: vkd3d_unreachable(); } @@ -6045,6 +6048,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, + [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d6adb689..74ffdd57 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -528,6 +528,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOF, VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, + VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_XOR, VKD3DSIH_INVALID,

1 0