- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Skip NtRaiseException() call on ARM when debugger is not present.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 8c41a215b99f8fefdf3aeba2e2838bbaa5082179 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c41a215b99f8fefdf3aeba2e2838b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 21:54:55 2023 +0100 ntdll: Skip NtRaiseException() call on ARM when debugger is not present. --- dlls/ntdll/signal_arm.c | 7 ++++++- dlls/ntdll/tests/exception.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e539289ec2f..ae355aa5a8c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1561,7 +1561,12 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "add r1, sp, #0x1a8\n\t" "str r1, [sp, #0x38]\n\t" /* context->Sp */ "mov r1, sp\n\t" - "mov r2, #1\n\t" + "mrc p15, 0, r3, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r3, [r3, #0x30]\n\t" /* peb */ + "ldrb r2, [r3, #2]\n\t" /* peb->BeingDebugged */ + "cbnz r2, 1f\n\t" + "bl " __ASM_NAME("dispatch_exception") "\n" + "1:\tmov r2, #1\n\t" "bl " __ASM_NAME("NtRaiseException") "\n\t" "bl " __ASM_NAME("RtlRaiseStatus") ) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7edc829d680..bac571b2733 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7425,7 +7425,6 @@ static void test_KiUserExceptionDispatcher(void) pRtlRaiseException(&record); ok(got_exception, "Handler was not called.\n"); - todo_wine ok(!hook_called, "Hook was called.\n"); memcpy( code_ptr, patched_code, sizeof(patched_code) );

1 0

Alexandre Julliard : ntdll: Fix stack layout for KiUserApcDispatcher on ARM.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 75d0d466ec98830ccd96afc587c180cd8a9c61ec URL: https://gitlab.winehq.org/wine/wine/-/commit/75d0d466ec98830ccd96afc587c180… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 14:16:42 2023 +0100 ntdll: Fix stack layout for KiUserApcDispatcher on ARM. --- dlls/ntdll/signal_arm.c | 29 +++++++++++--- dlls/ntdll/tests/exception.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 34 +++++++++------- 3 files changed, 137 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 63e058213a8..ece5eaeebf0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -547,12 +547,29 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, - PNTAPCFUNC func ) -{ - func( ctx, arg1, arg2 ); - NtContinue( context, TRUE ); -} +__ASM_GLOBAL_FUNC( KiUserApcDispatcher, + __ASM_SEH(".seh_custom 0xee,0x02\n\t") /* MSFT_OP_CONTEXT */ + "nop\n\t" + __ASM_SEH(".seh_stackalloc 0x18\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_EHABI(".save {sp}\n\t") /* Restore Sp last */ + __ASM_EHABI(".pad #-(0x80 + 0x0c + 0x0c)\n\t") /* Move back across D0-D15, Cpsr, Fpscr, Padding, Pc, Lr and Sp */ + __ASM_EHABI(".vsave {d8-d15}\n\t") + __ASM_EHABI(".pad #0x40\n\t") /* Skip past D0-D7 */ + __ASM_EHABI(".pad #0x0c\n\t") /* Skip past Cpsr, Fpscr and Padding */ + __ASM_EHABI(".save {lr, pc}\n\t") + __ASM_EHABI(".pad #0x08\n\t") /* Skip past R12 and Sp - Sp is restored last */ + __ASM_EHABI(".save {r4-r11}\n\t") + __ASM_EHABI(".pad #0x2c\n\t") /* Skip past args, ContextFlags and R0-R3 */ + "ldr r0, [sp, #0x04]\n\t" /* arg1 */ + "ldr r1, [sp, #0x08]\n\t" /* arg2 */ + "ldr r2, [sp, #0x0c]\n\t" /* arg3 */ + "ldr ip, [sp]\n\t" /* func */ + "blx ip\n\t" + "add r0, sp, #0x18\n\t" /* context */ + "ldr r1, [sp, #0x10]\n\t" /* alertable */ + "bl " __ASM_NAME("NtContinue") "\n\t" + "udf #1" ) /******************************************************************* diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c34deedcab1..8f360dca529 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7445,6 +7445,98 @@ static void test_KiUserExceptionDispatcher(void) VirtualProtect(code_ptr, sizeof(saved_code), old_protect, &old_protect); } +static UINT apc_count; +static UINT alertable_supported; + +static void CALLBACK apc_func( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +{ + ok( arg1 == 0x1234 + apc_count, "wrong arg1 %Ix\n", arg1 ); + ok( arg2 == 0x5678, "wrong arg2 %Ix\n", arg2 ); + ok( arg3 == 0xdeadbeef, "wrong arg3 %Ix\n", arg3 ); + apc_count++; +} + +static void * WINAPI hook_KiUserApcDispatcher(void *stack) +{ + struct + { + void *func; + ULONG args[3]; + ULONG alertable; + ULONG align; + CONTEXT context; + } *args = stack; + CONTEXT *context = &args->context; + + if (args->alertable == 1) alertable_supported = TRUE; + else context = (CONTEXT *)&args->alertable; + + trace( "stack=%p func=%p args=%lx,%lx,%lx alertable=%lx context=%p pc=%lx sp=%lx (%lx)\n", + args, args->func, args->args[0], args->args[1], args->args[2], + args->alertable, context, context->Pc, context->Sp, + context->Sp - (ULONG_PTR)stack ); + + ok( args->func == apc_func, "wrong func %p / %p\n", args->func, apc_func ); + ok( args->args[0] == 0x1234 + apc_count, "wrong arg1 %lx\n", args->args[0] ); + ok( args->args[1] == 0x5678, "wrong arg2 %lx\n", args->args[1] ); + ok( args->args[2] == 0xdeadbeef, "wrong arg3 %lx\n", args->args[2] ); + + if (apc_count && alertable_supported) args->alertable = FALSE; + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234 + apc_count + 1, 0x5678, 0xdeadbeef ); + + hook_called = TRUE; + memcpy( code_ptr, saved_code, sizeof(saved_code)); + FlushInstructionCache( GetCurrentProcess(), code_ptr, sizeof(saved_code)); + return pKiUserApcDispatcher; +} + +static void test_KiUserApcDispatcher(void) +{ + WORD hook_trampoline[] = + { + 0x4668, /* mov r0, sp */ + 0xf8df, 0xc006, /* ldr.w r12, [pc, #0x6] */ + 0x47e0, /* blx r12 */ + 0x4700, /* bx r0 */ + 0, 0, /* 1: hook_KiUserApcDispatcher */ + }; + DWORD old_protect; + BOOL ret; + + code_ptr = (void *)(((ULONG_PTR)pKiUserApcDispatcher) & ~1); /* mask thumb bit */ + *(void **)&hook_trampoline[5] = hook_KiUserApcDispatcher; + memcpy(code_mem, hook_trampoline, sizeof(hook_trampoline)); + + ret = VirtualProtect( code_ptr, sizeof(saved_code), + PAGE_EXECUTE_READWRITE, &old_protect ); + ok( ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError() ); + + memcpy( saved_code, code_ptr, sizeof(saved_code) ); + *(void **)&patched_code[4] = (char *)code_mem + 1; /* thumb */ + memcpy( code_ptr, patched_code, sizeof(patched_code) ); + FlushInstructionCache( GetCurrentProcess(), code_ptr, sizeof(patched_code)); + + hook_called = FALSE; + apc_count = 0; + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234, 0x5678, 0xdeadbeef ); + SleepEx( 0, TRUE ); + ok( apc_count == 2, "APC count %u\n", apc_count ); + ok( hook_called, "hook was not called\n" ); + + memcpy( code_ptr, patched_code, sizeof(patched_code) ); + FlushInstructionCache( GetCurrentProcess(), code_ptr, sizeof(patched_code)); + pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234 + apc_count, 0x5678, 0xdeadbeef ); + SleepEx( 0, TRUE ); + if (alertable_supported) + { + ok( apc_count == 3, "APC count %u\n", apc_count ); + SleepEx( 0, TRUE ); + } + ok( apc_count == 4, "APC count %u\n", apc_count ); + + VirtualProtect( code_ptr, sizeof(saved_code), old_protect, &old_protect ); +} + #elif defined(__aarch64__) #define UNW_FLAG_NHANDLER 0 @@ -12348,6 +12440,7 @@ START_TEST(exception) test_virtual_unwind(); test_KiUserExceptionDispatcher(); + test_KiUserApcDispatcher(); #endif diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9aa2994290e..fb31cecd1ad 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -184,6 +184,19 @@ struct exc_stack_layout C_ASSERT( offsetof(struct exc_stack_layout, rec) == 0x1a0 ); C_ASSERT( sizeof(struct exc_stack_layout) == 0x1f8 ); +/* stack layout when calling KiUserApcDispatcher */ +struct apc_stack_layout +{ + void *func; /* 000 APC to call*/ + ULONG args[3]; /* 004 function arguments */ + ULONG alertable; /* 010 */ + ULONG align; /* 014 */ + CONTEXT context; /* 018 */ + ULONG redzone[2]; /* 1b8 */ +}; +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x18 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x1c0 ); + struct syscall_frame { UINT r0; /* 000 */ @@ -1071,14 +1084,9 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a { struct syscall_frame *frame = arm_thread_data()->syscall_frame; ULONG sp = context ? context->Sp : frame->sp; - struct apc_stack_layout - { - void *func; - void *align; - CONTEXT context; - } *stack; + struct apc_stack_layout *stack; - sp &= ~15; + sp &= ~7; stack = (struct apc_stack_layout *)sp - 1; if (context) { @@ -1091,14 +1099,14 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.R0 = status; } + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + frame->sp = (DWORD)stack; frame->pc = (DWORD)pKiUserApcDispatcher; - frame->r0 = (DWORD)&stack->context; - frame->r1 = arg1; - frame->r2 = arg2; - frame->r3 = arg3; - stack->func = func; - frame->restore_flags |= CONTEXT_CONTROL | CONTEXT_INTEGER; + frame->restore_flags |= CONTEXT_CONTROL; return status; }

1 0

Alexandre Julliard : ntdll: Fix stack layout for KiUserCallbackDispatcher on ARM.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 5b068472141b30ee77877dd29a41958c5325af8d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b068472141b30ee77877dd29a4195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 14:18:15 2023 +0100 ntdll: Fix stack layout for KiUserCallbackDispatcher on ARM. --- dlls/ntdll/signal_arm.c | 17 ++++++++++- dlls/ntdll/tests/exception.c | 69 +++++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/signal_arm.c | 47 ++++++++++++++++++++---------- 3 files changed, 106 insertions(+), 27 deletions(-)

1 0

Alexandre Julliard : ntdll: Fix stack layout for KiUserExceptionDispatcher on ARM.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 89f3c59739e6a879b6f362dfd29d41347590449d URL: https://gitlab.winehq.org/wine/wine/-/commit/89f3c59739e6a879b6f362dfd29d41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 14:09:14 2023 +0100 ntdll: Fix stack layout for KiUserExceptionDispatcher on ARM. --- dlls/ntdll/signal_arm.c | 18 +++++++- dlls/ntdll/tests/exception.c | 103 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 57 ++++++++---------------- 3 files changed, 139 insertions(+), 39 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement context and machine frame unwind operations on ARM.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 42046a24d48f25de9542b840f8a5773182af5b8e URL: https://gitlab.winehq.org/wine/wine/-/commit/42046a24d48f25de9542b840f8a577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 13:47:21 2023 +0100 ntdll: Implement context and machine frame unwind operations on ARM. --- dlls/ntdll/signal_arm.c | 39 +++++++++++++++--- dlls/ntdll/tests/exception.c | 97 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 113 insertions(+), 23 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Fix some compiler warnings on ARM.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: de3fd9e2654a7b7b21830e361e4377e77aa18bcd URL: https://gitlab.winehq.org/wine/wine/-/commit/de3fd9e2654a7b7b21830e361e4377… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 13:29:28 2023 +0100 ntdll/tests: Fix some compiler warnings on ARM. --- dlls/ntdll/tests/exception.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f195fc6e5e5..7e4eec4a2ba 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5600,9 +5600,9 @@ static void test_raiseexception_regs(void) #define UWOP_SAVE_D0_RANGE(first,last) UWOP_TWOBYTES((0xF5 << 8) | (first << 4) | (last)) #define UWOP_SAVE_D16_RANGE(first,last)UWOP_TWOBYTES((0xF6 << 8) | ((first - 16) << 4) | (last - 16)) #define UWOP_ALLOC_LARGE(size) UWOP_THREEBYTES((0xF7 << 16) | (size/4)) -#define UWOP_ALLOC_HUGE(size) UWOP_FOURBYTES((0xF8 << 24) | (size/4)) +#define UWOP_ALLOC_HUGE(size) UWOP_FOURBYTES((0xF8u << 24) | (size/4)) #define UWOP_ALLOC_LARGEW(size) UWOP_THREEBYTES((0xF9 << 16) | (size/4)) -#define UWOP_ALLOC_HUGEW(size) UWOP_FOURBYTES((0xFA << 24) | (size/4)) +#define UWOP_ALLOC_HUGEW(size) UWOP_FOURBYTES((0xFAu << 24) | (size/4)) #define UWOP_NOP16 0xFB #define UWOP_NOP32 0xFC #define UWOP_END_NOP16 0xFD @@ -5690,7 +5690,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) context.Lr = (ULONG_PTR)ORIG_LR; context.R11 = (ULONG_PTR)fake_stack + test->results[i].fp_offset; orig_fp = context.R11; - orig_pc = (ULONG64)code_mem + code_offset + test->results[i].pc_offset; + orig_pc = (ULONG_PTR)code_mem + code_offset + test->results[i].pc_offset; trace( "%u/%u: pc=%p (%02x) fp=%p sp=%p\n", testnum, i, (void *)orig_pc, *(UINT *)orig_pc, (void *)orig_fp, (void *)context.Sp ); @@ -6544,7 +6544,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fc << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fcu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_18[] = { DW(unwind_info_18_packed) }; @@ -6575,7 +6575,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3ff << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3ffu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_19[] = { DW(unwind_info_19_packed) }; @@ -6610,7 +6610,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3f7 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f7u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_20[] = { DW(unwind_info_20_packed) }; @@ -6646,7 +6646,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fb << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fbu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_21[] = { DW(unwind_info_21_packed) }; @@ -6744,7 +6744,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (1 << 21) | /* C - hook up r11 */ - (0x3f5 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f5u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_24[] = { DW(unwind_info_24_packed) }; @@ -6776,7 +6776,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (1 << 21) | /* C - hook up r11 */ - (0x3f9 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f9u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_25[] = { DW(unwind_info_25_packed) }; @@ -6844,7 +6844,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3f6 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f6u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_27[] = { DW(unwind_info_27_packed) }; @@ -6874,7 +6874,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fa << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fau << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_28[] = { DW(unwind_info_28_packed) };

1 0

Henri Verbeet : vkd3d-shader: Update the vkd3d_shader_scan() documentation.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: vkd3d Branch: master Commit: 803dfc1246a33e23665a85d28ea78205a6efb998 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/803dfc1246a33e23665a85d28ea78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 4 16:44:48 2023 +0100 vkd3d-shader: Update the vkd3d_shader_scan() documentation. Scanning d3dbc sources is supported now, and vkd3d_shader_scan_combined_resource_sampler_info is supported as a chained structure. --- include/vkd3d_shader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed6d6432..c43b619d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2148,12 +2148,14 @@ VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_ver * * Currently this function supports the following code types: * - VKD3D_SHADER_SOURCE_DXBC_TPF + * - VKD3D_SHADER_SOURCE_D3D_BYTECODE * * \param compile_info A chained structure containing scan parameters. * \n - * The DXBC_TPF scanner supports the following chained structures: + * The scanner supports the following chained structures: * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_scan_signature_info + * - vkd3d_shader_scan_combined_resource_sampler_info * \n * Although the \a compile_info parameter is read-only, chained structures * passed to this function need not be, and may serve as output parameters,

1 0

Henri Verbeet : vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_compile_option_fragment_coordinate_origin.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: vkd3d Branch: master Commit: ee1c6bd48811166177593b01f39ae663b9981565 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee1c6bd48811166177593b01f39ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Dec 2 17:09:31 2023 +0100 vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_compile_option_fragment_coordinate_origin. --- include/vkd3d_shader.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66a7de9b..ed6d6432 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -191,6 +191,8 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin /** Fragment coordinates originate from the lower-left. This matches the * traditional behaviour of OpenGL environments. */ VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN), }; enum vkd3d_shader_compile_option_name

1 0

Henri Verbeet : readme: Document VKD3D_SHADER_CONFIG.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: vkd3d Branch: master Commit: ac5a583b11400406b769a5100bf71ff6ced58de8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ac5a583b11400406b769a5100bf71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 3 16:28:53 2023 +0100 readme: Document VKD3D_SHADER_CONFIG. --- README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README b/README index 664a2867..01078723 100644 --- a/README +++ b/README @@ -65,6 +65,11 @@ commas or semicolons. * VKD3D_DISABLE_EXTENSIONS - a list of Vulkan extensions that libvkd3d should not use even if available. + * VKD3D_SHADER_CONFIG - a list of options that change the behavior of + libvkd3d-shader. + * force_validation - Enable (additional) validation of libvkd3d-shader's + internal representation of shaders. + * VKD3D_SHADER_DEBUG - controls the debug level for log messages produced by libvkd3d-shader. See VKD3D_DEBUG for accepted values.

1 0

Conor McCarthy : vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in vkd3d_get_spirv_builtin().
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: vkd3d Branch: master Commit: b4d03c0221b2e97d78dfdb7f9803e02051009459 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4d03c0221b2e97d78dfdb7f9803e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 1 00:21:46 2023 +1000 vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in vkd3d_get_spirv_builtin(). --- libs/vkd3d-shader/spirv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 55afa1cc..2197b74d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4500,8 +4500,11 @@ static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct sp if ((builtin = get_spirv_builtin_for_register(reg_type))) return builtin; - if (sysval != VKD3D_SHADER_SV_NONE || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST)) + if ((sysval != VKD3D_SHADER_SV_NONE && sysval != VKD3D_SHADER_SV_TARGET) + || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST)) + { FIXME("Unhandled builtin (register type %#x, sysval %#x).\n", reg_type, sysval); + } return NULL; }

1 0