March 2024 - Wine-commits - list.winehq.org

Connor McAdams : d3dx9: Use base image pointer when decompressing source image.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 20b50c0096976d11ed7da43a31491082d28dd72e URL: https://gitlab.winehq.org/wine/wine/-/commit/20b50c0096976d11ed7da43a314910… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 29 13:33:08 2024 -0500 d3dx9: Use base image pointer when decompressing source image. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 11 ++++++----- dlls/d3dx9_36/tests/surface.c | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 25a762e7e8a..b8dd67d106f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1914,6 +1914,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, { const struct pixel_format_desc *srcformatdesc, *destformatdesc; struct volume src_size, dst_size, dst_size_aligned; + const BYTE *src_memory_offset = src_memory; RECT dst_rect_temp, dst_rect_aligned; IDirect3DSurface9 *surface; D3DSURFACE_DESC surfdesc; @@ -2000,7 +2001,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(hr = lock_surface(dst_surface, &dst_rect_aligned, &lockrect, &surface, TRUE))) return hr; - src_memory = (BYTE *)src_memory + src_rect->top / srcformatdesc->block_height * src_pitch + src_memory_offset += src_rect->top / srcformatdesc->block_height * src_pitch + src_rect->left / srcformatdesc->block_width * srcformatdesc->block_byte_count; if (src_format == surfdesc.Format @@ -2013,7 +2014,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && !(dst_rect->top & (destformatdesc->block_height - 1))) { TRACE("Simple copy.\n"); - copy_pixels(src_memory, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, + copy_pixels(src_memory_offset, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, &src_size, srcformatdesc); } else /* Stretching or format conversion. */ @@ -2075,7 +2076,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, ++ptr; } } - src_memory = src_uncompressed; + src_memory_offset = (BYTE *)src_uncompressed; src_pitch = src_size.width * sizeof(DWORD); srcformatdesc = get_format_info(D3DFMT_A8B8G8R8); } @@ -2110,7 +2111,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if ((filter & 0xf) == D3DX_FILTER_NONE) { - convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, + convert_argb_pixels(src_memory_offset, src_pitch, 0, &src_size, srcformatdesc, dst_mem, dst_pitch, 0, &dst_size, dst_format, color_key, src_palette); } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ @@ -2120,7 +2121,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ - point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, + point_filter_argb_pixels(src_memory_offset, src_pitch, 0, &src_size, srcformatdesc, dst_mem, dst_pitch, 0, &dst_size, dst_format, color_key, src_palette); } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 9eb77718cb1..4d7e0e0288a 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1652,12 +1652,12 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) get_surface_decompressed_readback(device, newsurf, &surface_rb); check_readback_pixel_4bpp(&surface_rb, 0, 0, 0xff0000ff, TRUE); /* Blue block, top left. */ - check_readback_pixel_4bpp(&surface_rb, 3, 3, 0xff000000, TRUE); /* Blue block, bottom right. */ + check_readback_pixel_4bpp(&surface_rb, 3, 3, 0xff000000, FALSE); /* Blue block, bottom right. */ check_readback_pixel_4bpp(&surface_rb, 7, 0, 0xff00ff00, TRUE); /* Green block, top right. */ - check_readback_pixel_4bpp(&surface_rb, 4, 3, 0xff000000, TRUE); /* Green block, bottom left. */ - check_readback_pixel_4bpp(&surface_rb, 3, 4, 0xff000000, TRUE); /* Red block, top right. */ + check_readback_pixel_4bpp(&surface_rb, 4, 3, 0xff000000, FALSE); /* Green block, bottom left. */ + check_readback_pixel_4bpp(&surface_rb, 3, 4, 0xff000000, FALSE); /* Red block, top right. */ check_readback_pixel_4bpp(&surface_rb, 0, 7, 0xffff0000, TRUE); /* Red block, bottom left. */ - check_readback_pixel_4bpp(&surface_rb, 4, 4, 0xff000000, TRUE); /* Black block, top left. */ + check_readback_pixel_4bpp(&surface_rb, 4, 4, 0xff000000, FALSE); /* Black block, top left. */ check_readback_pixel_4bpp(&surface_rb, 7, 7, 0xff000000, TRUE); /* Black block, bottom right. */ release_surface_readback(&surface_rb);

1 0

Connor McAdams : d3dx9: Split D3DXLoadSurfaceFromMemory functionality into a separate function.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 7ff4e5672d7b468eb1850c0412ab23524cf5343e URL: https://gitlab.winehq.org/wine/wine/-/commit/7ff4e5672d7b468eb1850c0412ab23… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Feb 27 10:10:09 2024 -0500 d3dx9: Split D3DXLoadSurfaceFromMemory functionality into a separate function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 353 +++++++++++++++++++++++++----------------------- 1 file changed, 187 insertions(+), 166 deletions(-)

1 0

Alexandre Julliard : ntdll: Use jump buffer definitions from setjmp.h.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 7a156cbd7fbbf1ce10f805bcfb43ff94fd94dda1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a156cbd7fbbf1ce10f805bcfb43ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:23:15 2024 +0100 ntdll: Use jump buffer definitions from setjmp.h. --- dlls/ntdll/signal_arm.c | 30 ++++-------------------------- dlls/ntdll/signal_arm64.c | 27 ++------------------------- dlls/ntdll/signal_x86_64.c | 44 +++----------------------------------------- 3 files changed, 9 insertions(+), 92 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index af33c6c08b6..49018d35721 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -37,25 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - unsigned long Frame; - unsigned long R4; - unsigned long R5; - unsigned long R6; - unsigned long R7; - unsigned long R8; - unsigned long R9; - unsigned long R10; - unsigned long R11; - unsigned long Sp; - unsigned long Pc; - unsigned long Fpscr; - unsigned long long D[8]; -}; - - static void dump_scope_table( ULONG base, const SCOPE_TABLE *table ) { unsigned int i; @@ -424,17 +406,13 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - int i; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; - for (i = 4; i <= 11; i++) - (&context->R4)[i-4] = (&jmp->R4)[i-4]; + memcpy( &context->R4, &jmp->R4, 8 * sizeof(DWORD) ); + memcpy( &context->D[8], &jmp->D[0], 8 * sizeof(ULONGLONG) ); context->Lr = jmp->Pc; context->Sp = jmp->Sp; context->Fpscr = jmp->Fpscr; - - for (i = 0; i < 8; i++) - context->D[8+i] = jmp->D[i]; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 32aca81b198..0be1807c0c3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -39,30 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Reserved; - unsigned __int64 X19; - unsigned __int64 X20; - unsigned __int64 X21; - unsigned __int64 X22; - unsigned __int64 X23; - unsigned __int64 X24; - unsigned __int64 X25; - unsigned __int64 X26; - unsigned __int64 X27; - unsigned __int64 X28; - unsigned __int64 Fp; - unsigned __int64 Lr; - unsigned __int64 Sp; - ULONG Fpcr; - ULONG Fpsr; - double D[8]; -}; - - static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) { unsigned int i; @@ -486,7 +463,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; int i; context->X19 = jmp->X19; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d5cc29bd5e1..cf6e9d8e65f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -37,36 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - ULONG64 Frame; - ULONG64 Rbx; - ULONG64 Rsp; - ULONG64 Rbp; - ULONG64 Rsi; - ULONG64 Rdi; - ULONG64 R12; - ULONG64 R13; - ULONG64 R14; - ULONG64 R15; - ULONG64 Rip; - ULONG MxCsr; - USHORT FpCsr; - USHORT Spare; - M128A Xmm6; - M128A Xmm7; - M128A Xmm8; - M128A Xmm9; - M128A Xmm10; - M128A Xmm11; - M128A Xmm12; - M128A Xmm13; - M128A Xmm14; - M128A Xmm15; -}; - - /******************************************************************* * syscalls */ @@ -726,7 +697,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; context->Rbx = jmp->Rbx; context->Rsp = jmp->Rsp; context->Rbp = jmp->Rbp; @@ -737,19 +708,10 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->R14 = jmp->R14; context->R15 = jmp->R15; context->Rip = jmp->Rip; - context->Xmm6 = jmp->Xmm6; - context->Xmm7 = jmp->Xmm7; - context->Xmm8 = jmp->Xmm8; - context->Xmm9 = jmp->Xmm9; - context->Xmm10 = jmp->Xmm10; - context->Xmm11 = jmp->Xmm11; - context->Xmm12 = jmp->Xmm12; - context->Xmm13 = jmp->Xmm13; - context->Xmm14 = jmp->Xmm14; - context->Xmm15 = jmp->Xmm15; context->MxCsr = jmp->MxCsr; context->FltSave.MxCsr = jmp->MxCsr; context->FltSave.ControlWord = jmp->FpCsr; + memcpy( &context->Xmm6, &jmp->Xmm6, 10 * sizeof(M128A) ); } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) {

1 0

Alexandre Julliard : ntdll: Export _setjmpex.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 8ec8a7f11cc4dea5755e66fc0b0d8da2325aebf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ec8a7f11cc4dea5755e66fc0b0d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:24:17 2024 +0100 ntdll: Export _setjmpex. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/signal_arm.c | 18 ++++++++++++++++++ dlls/ntdll/signal_arm64.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66995346e57..6fb91e8c9f1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1550,6 +1550,8 @@ @ cdecl _makepath_s(ptr long str str str str) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) +@ cdecl -norelay -arch=arm,x86_64 _setjmp(ptr ptr) NTDLL__setjmpex +@ cdecl -norelay -arch=!i386 _setjmpex(ptr ptr) NTDLL__setjmpex @ varargs _snprintf(ptr long str) NTDLL__snprintf @ varargs _snprintf_s(ptr long long str) @ varargs _snwprintf(ptr long wstr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 49018d35721..dd259322368 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -714,6 +714,24 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } + +/*********************************************************************** + * _setjmp (NTDLL.@) + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + ".seh_endprologue\n\t" + "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ + "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ + "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ + "vmrs r2, fpscr\n\t" + "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "add r0, r0, #0x30\n\t" + "vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ + "mov r0, #0\n\t" + "bx lr" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0be1807c0c3..c53d3382207 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -826,6 +826,32 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } + +/*********************************************************************** + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + ".seh_endprologue\n\t" + "str x1, [x0]\n\t" /* jmp_buf->Frame */ + "stp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "stp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "stp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "stp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "stp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "stp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ + "mov x2, sp\n\t" + "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "mrs x2, fpcr\n\t" + "mrs x3, fpsr\n\t" + "stp w2, w3, [x0, #0x78]\n\t" /* jmp_buf->Fpcr,Fpsr */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "stp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "stp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "stp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ + "mov x0, #0\n\t" + "ret" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cf6e9d8e65f..6e88877ee78 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1023,6 +1023,41 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * _setjmp (NTDLL.@) + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + __ASM_SEH(".seh_endprologue\n\t") + "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ + "movq %rbx,0x8(%rcx)\n\t" /* jmp_buf->Rbx */ + "leaq 0x8(%rsp),%rax\n\t" + "movq %rax,0x10(%rcx)\n\t" /* jmp_buf->Rsp */ + "movq %rbp,0x18(%rcx)\n\t" /* jmp_buf->Rbp */ + "movq %rsi,0x20(%rcx)\n\t" /* jmp_buf->Rsi */ + "movq %rdi,0x28(%rcx)\n\t" /* jmp_buf->Rdi */ + "movq %r12,0x30(%rcx)\n\t" /* jmp_buf->R12 */ + "movq %r13,0x38(%rcx)\n\t" /* jmp_buf->R13 */ + "movq %r14,0x40(%rcx)\n\t" /* jmp_buf->R14 */ + "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ + "movq (%rsp),%rax\n\t" + "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ + "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ + "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ + "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ + "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ + "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ + "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ + "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ + "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ + "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ + "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "xorq %rax,%rax\n\t" + "retq" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */

1 0

Brendan Shanks : quartz: Set the name of internal threads.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 542e11fcd9951cc6e3dbe37863bfbbe4a915ad07 URL: https://gitlab.winehq.org/wine/wine/-/commit/542e11fcd9951cc6e3dbe37863bfbb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 6 16:24:07 2024 -0800 quartz: Set the name of internal threads. --- dlls/quartz/filesource.c | 2 ++ dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/systemclock.c | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 7d6292df579..f96555ff78c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -381,6 +381,8 @@ static DWORD CALLBACK io_thread(void *arg) DWORD size; BOOL ret; + SetThreadDescription(GetCurrentThread(), L"wine_qz_async_reader_io"); + for (;;) { ret = GetQueuedCompletionStatus(filter->port, &size, &key, &ovl, INFINITE); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4100e71be3a..9b2b2b4e93b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1033,6 +1033,8 @@ static DWORD WINAPI message_thread_run(void *ctx) { MSG msg; + SetThreadDescription(GetCurrentThread(), L"wine_qz_graph_worker"); + /* Make sure we have a message queue. */ PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE); SetEvent(message_thread_ret); diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 01a8e9fa1ee..244bfd294b6 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -144,6 +144,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) REFERENCE_TIME current_time; TRACE("Starting advise thread for clock %p.\n", clock); + SetThreadDescription(GetCurrentThread(), L"wine_qz_clock_advise"); for (;;) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower casts to int using REINTERPRET instead.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: a3319339e467beb2f03836842801e9c59eb3f988 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a3319339e467beb2f03836842801e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 21 16:36:43 2024 -0300 vkd3d-shader/hlsl: Lower casts to int using REINTERPRET instead. I realized that it is better to lower casts to int to FLOOR+REINTERPET instead of appending a FLOOR to all casts to int and assuming that this is the case for all of them in d3dbc.c. This in case we introduce new passes in the future that add casts that we forget to lower, after the lower_casts_to_bool pass. --- libs/vkd3d-shader/d3dbc.c | 11 ++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 15 +++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index a697a2a8..0f5d34ee 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2002,7 +2002,10 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: - /* A compilation pass applies a FLOOR operation to casts to int, so no change is necessary. */ + /* A compilation pass turns these into FLOOR+REINTERPRET, so we should not + * reach this case unless we are missing something. */ + hlsl_fixme(ctx, &instr->loc, "Unlowered SM1 cast from float to integer."); + break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); @@ -2242,6 +2245,12 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b assert(instr->reg.allocated); + if (expr->op == HLSL_OP1_REINTERPRET) + { + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + return; + } + if (expr->op == HLSL_OP1_CAST) { write_sm1_cast(ctx, buffer, instr); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e7fc02d0..413888d8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2647,10 +2647,11 @@ static bool sort_synthetic_separated_samplers_first(struct hlsl_ctx *ctx) return false; } -/* Append a FLOOR before a CAST to int or uint (which is written as a mere MOV). */ +/* Turn CAST to int or uint into FLOOR + REINTERPRET (which is written as a mere MOV). */ static bool lower_casts_to_int(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { - struct hlsl_ir_node *arg, *floor, *cast2; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }; + struct hlsl_ir_node *arg, *floor, *res; struct hlsl_ir_expr *expr; if (instr->type != HLSL_IR_EXPR) @@ -2665,17 +2666,15 @@ static bool lower_casts_to_int(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (arg->data_type->base_type != HLSL_TYPE_FLOAT && arg->data_type->base_type != HLSL_TYPE_HALF) return false; - /* Check that the argument is not already a FLOOR */ - if (arg->type == HLSL_IR_EXPR && hlsl_ir_expr(arg)->op == HLSL_OP1_FLOOR) - return false; - if (!(floor = hlsl_new_unary_expr(ctx, HLSL_OP1_FLOOR, arg, &instr->loc))) return false; hlsl_block_add_instr(block, floor); - if (!(cast2 = hlsl_new_cast(ctx, floor, instr->data_type, &instr->loc))) + memset(operands, 0, sizeof(operands)); + operands[0] = floor; + if (!(res = hlsl_new_expr(ctx, HLSL_OP1_REINTERPRET, operands, instr->data_type, &instr->loc))) return false; - hlsl_block_add_instr(block, cast2); + hlsl_block_add_instr(block, res); return true; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower non-float operators for SM1.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: 747511131de3cce5d223641143b5b0b3a1b697ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/747511131de3cce5d223641143b5b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 21 16:17:45 2024 -0300 vkd3d-shader/hlsl: Lower non-float operators for SM1. --- libs/vkd3d-shader/hlsl_codegen.c | 62 +++++++++++++++++++++++++++ tests/hlsl/arithmetic-int-uniform.shader_test | 4 +- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 413888d8..8434a921 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3343,6 +3343,61 @@ static bool lower_float_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_nonfloat_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op == HLSL_OP1_CAST || instr->data_type->base_type == HLSL_TYPE_FLOAT) + return false; + + switch (expr->op) + { + case HLSL_OP1_ABS: + case HLSL_OP1_NEG: + case HLSL_OP2_ADD: + case HLSL_OP2_DIV: + case HLSL_OP2_MAX: + case HLSL_OP2_MIN: + case HLSL_OP2_MUL: + { + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_ir_node *arg, *arg_cast, *float_expr, *ret; + struct hlsl_type *float_type; + unsigned int i; + + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) + { + arg = expr->operands[i].node; + if (!arg) + continue; + + float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, arg->data_type->dimx); + if (!(arg_cast = hlsl_new_cast(ctx, arg, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, arg_cast); + + operands[i] = arg_cast; + } + + float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, instr->data_type->dimx); + if (!(float_expr = hlsl_new_expr(ctx, expr->op, operands, float_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, float_expr); + + if (!(ret = hlsl_new_cast(ctx, float_expr, instr->data_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, ret); + + return true; + } + default: + return false; + } +} + static bool lower_discard_neg(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_node *zero, *bool_false, *or, *cmp, *load; @@ -5122,6 +5177,13 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry remove_unreachable_code(ctx, body); hlsl_transform_ir(ctx, normalize_switch_cases, body, NULL); + if (profile-> major_version < 4) + { + lower_ir(ctx, lower_nonfloat_exprs, body); + /* Constants casted to float must be folded. */ + hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + } + lower_ir(ctx, lower_nonconstant_vector_derefs, body); lower_ir(ctx, lower_casts_to_bool, body); lower_ir(ctx, lower_int_dot, body); diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index e176d4b8..48e1ae1a 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -88,7 +88,7 @@ uniform 0 float4 45.0 5.0 0.0 0.0 todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 a; float4 main() : SV_TARGET @@ -98,7 +98,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo(sm<4) draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0) [pixel shader todo(sm<4)]

1 0

Francisco Casas : vkd3d-shader/d3dbc: Implement bool to float cast as MOV.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: 58c456ff2bec9c413b23d898f15808316f25c69f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58c456ff2bec9c413b23d898f1580… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 20 22:06:45 2024 -0300 vkd3d-shader/d3dbc: Implement bool to float cast as MOV. In SM1, bools are always represented as either 0.0f or 1.0f at runtime. --- libs/vkd3d-shader/d3dbc.c | 7 ++----- tests/hlsl/cast-to-float.shader_test | 4 ++-- tests/hlsl/cast-to-half.shader_test | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 0f5d34ee..a8cca17f 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1977,16 +1977,13 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - /* Integers are internally represented as floats, so no change is necessary.*/ + case HLSL_TYPE_BOOL: + /* Integrals are internally represented as floats, so no change is necessary.*/ case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); break; - case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to float."); - break; - case HLSL_TYPE_DOUBLE: hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to float."); break; diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index bcb546e2..d80d4290 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test index 0580fe25..8094a10a 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0

Conor McCarthy : tests/shader-runner: Add raw UAV tests.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: 13143700b76104c1556dd350b3777b9706fd3838 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13143700b76104c1556dd350b3777… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 26 14:31:54 2024 +1000 tests/shader-runner: Add raw UAV tests. --- Makefile.am | 1 + tests/d3d12.c | 41 ----------- tests/hlsl/uav-rwbyteaddressbuffer.shader_test | 59 ++++++++++++++++ tests/shader_runner.c | 52 +++++++++++--- tests/utils.h | 97 ++++++++++++++++++++++++++ 5 files changed, 199 insertions(+), 51 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Always use a 64-bit write mask for IMMCONST64 src params.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: 5082893e5d06760a4fa3187d8db6091638604107 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5082893e5d06760a4fa3187d8db60… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 27 17:48:36 2024 +1000 vkd3d-shader/spirv: Always use a 64-bit write mask for IMMCONST64 src params. There is no way to tell in spirv_compiler_emit_load_reg() if the write mask is 64-bit. All loads are 32-bit except for IMMCONST64 and SSA, and the latter ignores the mask, so the only issue lies with IMMCONST64. --- libs/vkd3d-shader/spirv.c | 6 ++++-- tests/hlsl/uav-rwbyteaddressbuffer.shader_test | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6b5f54fe..c0cbdccf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7093,8 +7093,8 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + unsigned int i, component_count, write_mask; uint32_t components[VKD3D_VEC4_SIZE]; - unsigned int i, component_count; if (register_is_constant_or_undef(&src->reg) || src->reg.type == VKD3DSPR_SSA || dst->reg.type == VKD3DSPR_SSA || dst->modifiers || src->modifiers) @@ -7145,7 +7145,9 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, } general_implementation: - val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + write_mask = (src->reg.type == VKD3DSPR_IMMCONST64 && !data_type_is_64_bit(dst->reg.data_type)) + ? vsir_write_mask_64_from_32(dst->write_mask) : dst->write_mask; + val_id = spirv_compiler_emit_load_src(compiler, src, write_mask); if (dst->reg.data_type != src->reg.data_type) { val_id = vkd3d_spirv_build_op_bitcast(builder, vkd3d_spirv_get_type_id_for_data_type(builder, diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test index 056f94f6..556d0fb3 100644 --- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test +++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test @@ -34,7 +34,7 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm<6) draw quad if(sm<6) probe uav 1 (0) ri (12) if(sm>=6) probe uav 1 (0) rd (12.2) @@ -54,6 +54,6 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe uav 1 (0) ri64 (-12) probe uav 1 (1) rd (13.3)

1 0