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

Zebediah Figura : tests: Use a UAV barrier between ClearUnorderedAccessViewFloat() and a compute shader.
by Alexandre Julliard March 13, 2024

March 13, 2024

Module: vkd3d Branch: master Commit: a686fa7750b44462c18c62757aa9b897f09d5056 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a686fa7750b44462c18c62757aa9b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 12 19:13:18 2024 -0500 tests: Use a UAV barrier between ClearUnorderedAccessViewFloat() and a compute shader. In an attempt to fix test failures on radv. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e3771b7f..15aed9f3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23171,6 +23171,7 @@ static void test_cs_uav_store(void) ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list, gpu_descriptor_handle, cpu_descriptor_handle, resource, zero, 0, NULL); + uav_barrier(command_list, resource); ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); @@ -23200,6 +23201,7 @@ static void test_cs_uav_store(void) ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(command_list, gpu_descriptor_handle, cpu_descriptor_handle, resource, zero, 0, NULL); + uav_barrier(command_list, resource); ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, 1,

1 0

Alexandre Julliard : ntdll: Always use SEH support on ARM64.
by Alexandre Julliard March 13, 2024

March 13, 2024

Module: wine Branch: master Commit: 8c1f96f7abd2307c3fc3e998fe16927cc4aaccb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c1f96f7abd2307c3fc3e998fe1692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 11:24:26 2024 +0100 ntdll: Always use SEH support on ARM64. --- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/signal_arm64.c | 25 +++++++++++-------------- dlls/ntdll/signal_arm64ec.c | 6 +++--- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index ecb76eaedbd..959dde9a5f5 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -646,10 +646,10 @@ void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); __ASM_GLOBAL_FUNC( call_entry_point, "stp x29, x30, [SP,#-16]!\n\t" - __ASM_SEH(".seh_save_fplr_x 16\n\t") + ".seh_save_fplr_x 16\n\t" "mov x29, SP\n\t" - __ASM_SEH(".seh_set_fp\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_set_fp\n\t" + ".seh_endprologue\n\t" "ldr x8, [x2, #-32]\n\t" "mov x9, x0\n\t" "cbz w1, 2f\n\t" diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 6bd99df3ff1..2568cf1ae22 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -305,8 +305,8 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) * KiUserExceptionDispatcher (NTDLL.@) */ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, - __ASM_SEH(".seh_context\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_context\n\t" + ".seh_endprologue\n\t" "adr x16, " __ASM_NAME("pWow64PrepareForException") "\n\t" "ldr x16, [x16]\n\t" "cbz x16, 1f\n\t" @@ -323,10 +323,10 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, * KiUserApcDispatcher (NTDLL.@) */ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, - __ASM_SEH(".seh_context\n\t") + ".seh_context\n\t" "nop\n\t" - __ASM_SEH(".seh_stackalloc 0x30\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_stackalloc 0x30\n\t" + ".seh_endprologue\n\t" "ldp x16, x0, [sp]\n\t" /* func, arg1 */ "ldp x1, x2, [sp, #0x10]\n\t" /* arg2, arg3 */ "add x3, sp, #0x30\n\t" /* context (FIXME) */ @@ -660,13 +660,10 @@ __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, */ __ASM_GLOBAL_FUNC( RtlRaiseException, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ + ".seh_stackalloc 0x3b0\n\t" "stp x29, x30, [sp]\n\t" - __ASM_SEH(".seh_stackalloc 0x3b0\n\t") - __ASM_SEH(".seh_save_fplr 0\n\t") - __ASM_SEH(".seh_endprologue\n\t") - __ASM_CFI(".cfi_def_cfa x29, 944\n\t") - __ASM_CFI(".cfi_offset x30, -936\n\t") - __ASM_CFI(".cfi_offset x29, -944\n\t") + ".seh_save_fplr 0\n\t" + ".seh_endprologue\n\t" "mov x29, sp\n\t" "str x0, [sp, #0x10]\n\t" "add x0, sp, #0x20\n\t" @@ -741,15 +738,15 @@ void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) */ __ASM_GLOBAL_FUNC( RtlUserThreadStart, "stp x29, x30, [sp, #-16]!\n\t" - __ASM_SEH(".seh_save_fplr_x 16\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" "adr x8, " __ASM_NAME("pBaseThreadInitThunk") "\n\t" "ldr x8, [x8]\n\t" "mov x2, x1\n\t" "mov x1, x0\n\t" "mov x0, #0\n\t" "blr x8\n\t" - __ASM_SEH(".seh_handler " __ASM_NAME("call_unhandled_exception_handler") ", @except") ) + ".seh_handler call_unhandled_exception_handler, @except" ) /****************************************************************** * LdrInitializeThunk (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 55ed12a609a..8ec2575c786 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1758,10 +1758,10 @@ static void __attribute__((used)) dispatch_apc( void (CALLBACK *func)(ULONG_PTR, NtContinue( &context.AMD64_Context, alertable ); } __ASM_GLOBAL_FUNC( "#KiUserApcDispatcher", - __ASM_SEH(".seh_context\n\t") + ".seh_context\n\t" "nop\n\t" - __ASM_SEH(".seh_stackalloc 0x30\n\t") - __ASM_SEH(".seh_endprologue\n\t") + ".seh_stackalloc 0x30\n\t" + ".seh_endprologue\n\t" "ldp x0, x1, [sp]\n\t" /* func, arg1 */ "ldp x2, x3, [sp, #0x10]\n\t" /* arg2, arg3 */ "ldr w4, [sp, #0x20]\n\t" /* alertable */

1 0

Alexandre Julliard : ntdll: Implement RtlUnwindEx on ARM64EC.
by Alexandre Julliard March 13, 2024

March 13, 2024

Module: wine Branch: master Commit: 83949ee2693076f8fc058c2515ffef5e86825091 URL: https://gitlab.winehq.org/wine/wine/-/commit/83949ee2693076f8fc058c2515ffef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 09:55:32 2024 +0100 ntdll: Implement RtlUnwindEx on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 190 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 643ec3331de..1e62f7a3118 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1542,6 +1542,59 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT_ARM64EC *dispatch } +/********************************************************************** + * unwind_exception_handler + * + * Handler for exceptions happening while calling an unwind handler. + */ +EXCEPTION_DISPOSITION WINAPI unwind_exception_handler( EXCEPTION_RECORD *record, void *frame, + CONTEXT *context, DISPATCHER_CONTEXT_ARM64EC *dispatch ) +{ + DISPATCHER_CONTEXT_ARM64EC *orig_dispatch = ((DISPATCHER_CONTEXT_ARM64EC **)frame)[-2]; + + /* copy the original dispatcher into the current one, except for the TargetPc */ + dispatch->ControlPc = orig_dispatch->ControlPc; + dispatch->ImageBase = orig_dispatch->ImageBase; + dispatch->FunctionEntry = orig_dispatch->FunctionEntry; + dispatch->EstablisherFrame = orig_dispatch->EstablisherFrame; + dispatch->LanguageHandler = orig_dispatch->LanguageHandler; + dispatch->HandlerData = orig_dispatch->HandlerData; + dispatch->HistoryTable = orig_dispatch->HistoryTable; + dispatch->ScopeIndex = orig_dispatch->ScopeIndex; + dispatch->ControlPcIsUnwound = orig_dispatch->ControlPcIsUnwound; + *dispatch->ContextRecord = *orig_dispatch->ContextRecord; + memcpy( dispatch->NonVolatileRegisters, orig_dispatch->NonVolatileRegisters, + sizeof(DISPATCHER_CONTEXT_NONVOLREG_ARM64) ); + TRACE( "detected collided unwind\n" ); + return ExceptionCollidedUnwind; +} + + +/********************************************************************** + * call_unwind_handler + */ +static DWORD __attribute__((naked)) call_unwind_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, + PEXCEPTION_ROUTINE handler ) +{ + asm( ".seh_proc call_unwind_handler\n\t" + "stp x29, x30, [sp, #-32]!\n\t" + ".seh_save_fplr_x 32\n\t" + ".seh_endprologue\n\t" + ".seh_handler unwind_exception_handler, @except\n\t" + "str x3, [sp, #16]\n\t" /* frame[-2] = dispatch */ + "mov x11, x4\n\t" /* handler */ + "adr x10, $iexit_thunk$cdecl$i8$i8i8i8i8\n\t" + "adrp x16, __os_arm64x_dispatch_icall\n\t" + "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" + "blr x16\n\t" + "blr x11\n\t" + "ldp x29, x30, [sp], #32\n\t" + "ret\n\t" + ".seh_endproc" ); +} + + /*********************************************************************** * call_seh_handler */ @@ -1991,7 +2044,142 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec, PVOID retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { - FIXME( "not implemented\n" ); + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + DISPATCHER_CONTEXT_NONVOLREG_ARM64 nonvol_regs; + EXCEPTION_RECORD record; + DISPATCHER_CONTEXT_ARM64EC dispatch; + ARM64EC_NT_CONTEXT new_context; + NTSTATUS status; + ULONG_PTR frame; + DWORD i, res; + BOOL is_target_ec = RtlIsEcCode( (ULONG_PTR)target_ip ); + + RtlCaptureContext( context ); + new_context.AMD64_Context = *context; + + /* build an exception record, if we do not have one */ + if (!rec) + { + record.ExceptionCode = STATUS_UNWIND; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = (void *)context->Rip; + record.NumberParameters = 0; + rec = &record; + } + + rec->ExceptionFlags |= EXCEPTION_UNWINDING | (end_frame ? 0 : EXCEPTION_EXIT_UNWIND); + + TRACE( "code=%lx flags=%lx end_frame=%p target_ip=%p\n", + rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip ); + for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++) + TRACE( " info[%ld]=%016I64x\n", i, rec->ExceptionInformation[i] ); + TRACE_CONTEXT( context ); + + dispatch.TargetIp = (ULONG64)target_ip; + dispatch.ContextRecord = context; + dispatch.HistoryTable = table; + dispatch.NonVolatileRegisters = nonvol_regs.Buffer; + + for (;;) + { + status = virtual_unwind( UNW_FLAG_UHANDLER, &dispatch, &new_context ); + if (status != STATUS_SUCCESS) raise_status( status, rec ); + + unwind_done: + if (!dispatch.EstablisherFrame) break; + + if (!is_valid_arm64ec_frame( dispatch.EstablisherFrame )) + { + ERR( "invalid frame %I64x (%p-%p)\n", dispatch.EstablisherFrame, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + rec->ExceptionFlags |= EXCEPTION_STACK_INVALID; + break; + } + + if (dispatch.LanguageHandler) + { + if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame)) + { + ERR( "invalid end frame %I64x/%p\n", dispatch.EstablisherFrame, end_frame ); + raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); + } + if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EXCEPTION_TARGET_UNWIND; + + TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, + dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, dispatch.EstablisherFrame, dispatch.ContextRecord, + &dispatch, dispatch.LanguageHandler ); + TRACE( "handler %p returned %lx\n", dispatch.LanguageHandler, res ); + + switch (res) + { + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: + new_context.AMD64_Context = *context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, + dispatch.FunctionEntry, &new_context.AMD64_Context, + &dispatch.HandlerData, &frame, NULL ); + rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; + goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + } + else /* hack: call builtin handlers registered in the tib list */ + { + while (is_valid_arm64ec_frame( (ULONG_PTR)teb_frame ) && + (ULONG64)teb_frame < new_context.Sp && + (ULONG64)teb_frame < (ULONG64)end_frame) + { + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, (ULONG_PTR)teb_frame, dispatch.ContextRecord, &dispatch, + (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); + teb_frame = __wine_pop_frame( teb_frame ); + + switch (res) + { + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: + new_context.AMD64_Context = *context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, + dispatch.FunctionEntry, &new_context.AMD64_Context, + &dispatch.HandlerData, &frame, NULL ); + rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; + goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + } + if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Sp) break; + } + + if (dispatch.EstablisherFrame == (ULONG64)end_frame) + { + if (is_target_ec) break; + if (!RtlIsEcCode( dispatch.ControlPc )) break; + /* we just crossed into x64 code, unwind one more frame */ + } + *context = new_context.AMD64_Context; + } + + if (rec->ExceptionCode != STATUS_UNWIND_CONSOLIDATE) + context->Rip = (ULONG64)target_ip; + else if (rec->ExceptionInformation[10] == -1) + rec->ExceptionInformation[10] = (ULONG_PTR)&nonvol_regs; + + if (is_target_ec) context->Rcx = (ULONG64)retval; + else context->Rax = (ULONG64)retval; + RtlRestoreContext( context, rec ); }

1 0

Alexandre Julliard : ntdll: Implement __C_specific_handler on ARM64EC.
by Alexandre Julliard March 13, 2024

March 13, 2024

Module: wine Branch: master Commit: c47d6ef1f782fe305851ac339c8424162ca7c559 URL: https://gitlab.winehq.org/wine/wine/-/commit/c47d6ef1f782fe305851ac339c8424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 11:03:01 2024 +0100 ntdll: Implement __C_specific_handler on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntdll/unwind.c | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 1007df91f85..55ed12a609a 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2333,6 +2333,40 @@ void __attribute__((naked)) __chkstk_arm64ec(void) } +/******************************************************************* + * __C_ExecuteExceptionFilter + */ +LONG __attribute__((naked)) __C_ExecuteExceptionFilter( EXCEPTION_POINTERS *ptrs, void *frame, + PEXCEPTION_FILTER filter, BYTE *nonvolatile ) +{ + asm( ".seh_proc _C_ExecuteExceptionFilter\n\t" + "stp x29, x30, [sp, #-80]!\n\t" + ".seh_save_fplr_x 80\n\t" + "stp x19, x20, [sp, #16]\n\t" + ".seh_save_regp x19, 16\n\t" + "stp x21, x22, [sp, #32]\n\t" + ".seh_save_regp x21, 32\n\t" + "stp x25, x26, [sp, #48]\n\t" + ".seh_save_regp x25, 48\n\t" + "str x27, [sp, #64]\n\t" + ".seh_save_reg x27, 64\n\t" + ".seh_endprologue\n\t" + "ldp x19, x20, [x3, #0]\n\t" /* nonvolatile regs */ + "ldp x21, x22, [x3, #16]\n\t" + "ldp x25, x26, [x3, #48]\n\t" + "ldr x27, [x3, #64]\n\t" + "ldr x1, [x3, #80]\n\t" /* x29 = frame */ + "blr x2\n\t" /* filter */ + "ldp x19, x20, [sp, #16]\n\t" + "ldp x21, x22, [sp, #32]\n\t" + "ldp x25, x26, [sp, #48]\n\t" + "ldr x27, [sp, #64]\n\t" + "ldp x29, x30, [sp], #80\n\t" + "ret\n\t" + ".seh_endproc" ); +} + + /*********************************************************************** * RtlRaiseException (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 3960d13143d..06779247da1 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -2204,6 +2204,12 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, void * ULONG_PTR pc = dispatch->ControlPc; unsigned int i; +#ifdef __arm64ec__ + if (RtlIsEcCode( pc )) + return __C_specific_handler_arm64( rec, frame, (ARM64_NT_CONTEXT *)context, + (DISPATCHER_CONTEXT_ARM64 *)dispatch ); +#endif + TRACE( "%p %p %p %p pc %Ix\n", rec, frame, context, dispatch, pc ); if (TRACE_ON(unwind)) DUMP_SCOPE_TABLE( base, table );

1 0

Alexandre Julliard : ntdll: Move __C_specific_handler implementation to unwind.c.
by Alexandre Julliard March 13, 2024

March 13, 2024

Module: wine Branch: master Commit: 7b5267cf63f225519ef4ef53c111402adc325116 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b5267cf63f225519ef4ef53c11140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 10:44:21 2024 +0100 ntdll: Move __C_specific_handler implementation to unwind.c. --- dlls/ntdll/signal_arm.c | 107 +-------------------- dlls/ntdll/signal_arm64.c | 146 +++------------------------- dlls/ntdll/signal_arm64ec.c | 13 --- dlls/ntdll/signal_x86_64.c | 90 ----------------- dlls/ntdll/unwind.c | 229 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+), 340 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/glsl: Introduce glsl_compile().
by Alexandre Julliard March 12, 2024

March 12, 2024

Module: vkd3d Branch: master Commit: 9b0d304f8fe4e6f0d065e4561af9e372e1643c2d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b0d304f8fe4e6f0d065e4561af9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 17 18:36:33 2023 +0100 vkd3d-shader/glsl: Introduce glsl_compile(). --- libs/vkd3d-shader/glsl.c | 44 ++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_main.c | 11 +------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 +---- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index e020bf3e..7c630d18 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -27,21 +27,6 @@ struct vkd3d_glsl_generator bool failed; }; -struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, - struct vkd3d_shader_message_context *message_context) -{ - struct vkd3d_glsl_generator *generator; - - if (!(generator = vkd3d_malloc(sizeof(*generator)))) - return NULL; - - memset(generator, 0, sizeof(*generator)); - generator->version = *version; - vkd3d_string_buffer_init(&generator->buffer); - generator->message_context = message_context; - return generator; -} - static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( struct vkd3d_glsl_generator *generator, enum vkd3d_shader_error error, const char *fmt, ...) @@ -91,7 +76,7 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator } } -int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, +static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vsir_program *program, struct vkd3d_shader_code *out) { unsigned int i; @@ -123,8 +108,29 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, return VKD3D_OK; } -void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator) +static void vkd3d_glsl_generator_cleanup(struct vkd3d_glsl_generator *gen) { - vkd3d_string_buffer_cleanup(&generator->buffer); - vkd3d_free(generator); + vkd3d_string_buffer_cleanup(&gen->buffer); +} + +static void vkd3d_glsl_generator_init(struct vkd3d_glsl_generator *gen, + const struct vkd3d_shader_version *version, struct vkd3d_shader_message_context *message_context) +{ + memset(gen, 0, sizeof(*gen)); + gen->version = *version; + vkd3d_string_buffer_init(&gen->buffer); + gen->message_context = message_context; +} + +int glsl_compile(struct vsir_program *program, struct vkd3d_shader_code *out, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_glsl_generator generator; + int ret; + + vkd3d_glsl_generator_init(&generator, &program->shader_version, message_context); + ret = vkd3d_glsl_generator_generate(&generator, program, out); + vkd3d_glsl_generator_cleanup(&generator); + + return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 36aa5916..ff361a2b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1554,7 +1554,6 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, { struct vkd3d_shader_scan_descriptor_info1 scan_descriptor_info; struct vsir_program *program = &parser->program; - struct vkd3d_glsl_generator *glsl_generator; struct vkd3d_shader_compile_info scan_info; int ret; @@ -1569,15 +1568,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_GLSL: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - if (!(glsl_generator = vkd3d_glsl_generator_create(&program->shader_version, message_context))) - { - ERR("Failed to create GLSL generator.\n"); - vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); - return VKD3D_ERROR; - } - - ret = vkd3d_glsl_generator_generate(glsl_generator, program, out); - vkd3d_glsl_generator_destroy(glsl_generator); + ret = glsl_compile(program, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 02902900..ba018070 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1504,13 +1504,8 @@ int shader_extract_from_dxbc(const struct vkd3d_shader_code *dxbc, int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context, struct shader_signature *signature); -struct vkd3d_glsl_generator; - -struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, +int glsl_compile(struct vsir_program *program, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); -int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, - struct vsir_program *program, struct vkd3d_shader_code *out); -void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); #define SPIRV_MAX_SRC_COUNT 6

1 0

Francisco Casas : tests: Avoid creating a file named "0" when calling "make check".
by Alexandre Julliard March 12, 2024

March 12, 2024

Module: vkd3d Branch: master Commit: b831ffe96c3e546fc9038c9308862d07b9aa267c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b831ffe96c3e546fc9038c9308862… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Mar 11 22:02:30 2024 -0300 tests: Avoid creating a file named "0" when calling "make check". We use "printf" instead of "print" in awk in order to avoid a newline in the value of $xfcount, and use "-gt" instead of ">", which creates the spurious file, in the comparison. --- tests/test-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-driver.sh b/tests/test-driver.sh index 39a3e427..221a963e 100755 --- a/tests/test-driver.sh +++ b/tests/test-driver.sh @@ -183,7 +183,7 @@ EOF details=$(awk "$awk_program" "$log_file") # Count number of [XF] tags. -xfcount=$(echo "$details" | awk '/\[XF\]/{count++} END{print count}') +xfcount=$(echo "$details" | awk '/\[XF\]/{count++} END{printf "%d", count}') details=$(echo "$details" |\ sed "s/\[F\]/$color_bright_red[F]$color_reset/g" |\ @@ -197,7 +197,7 @@ details=$(echo "$details" |\ awk 'NF != 1' ) # If the test passes but has [XF], we will omit details but report number of [XF] -if [ "$res" = "PASS" ] && [ $xfcount > 0 ]; then +if [ "$res" = "PASS" ] && [ "$xfcount" -gt 0 ]; then details="$color_yellow($xfcount XF)$color_reset" fi

1 0

Henri Verbeet : vkd3d-shader/d3d-asm: Get rid of the (now) redundant "shader_desc" parameter to vkd3d_dxbc_binary_to_text().
by Alexandre Julliard March 12, 2024

March 12, 2024

Module: vkd3d Branch: master Commit: bdc096d437c6937002fcb70baaa9612946d1c84e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bdc096d437c6937002fcb70baaa96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 11 15:23:57 2024 +0100 vkd3d-shader/d3d-asm: Get rid of the (now) redundant "shader_desc" parameter to vkd3d_dxbc_binary_to_text(). And rename the function to d3d_asm_compile() while we're touching it. --- libs/vkd3d-shader/d3d_asm.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 7b30d260..fcbb321e 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -2222,8 +2222,8 @@ static enum vkd3d_result dump_signatures(struct vkd3d_d3d_asm_compiler *compiler return VKD3D_OK; } -enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, - const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, +enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, enum vsir_asm_flags flags) { const struct vkd3d_shader_version *shader_version = &program->shader_version; @@ -2357,7 +2357,7 @@ void vkd3d_shader_trace(const struct vsir_program *program) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(program, NULL, NULL, &code, VSIR_ASM_FLAG_DUMP_TYPES) != VKD3D_OK) + if (d3d_asm_compile(program, NULL, &code, VSIR_ASM_FLAG_DUMP_TYPES) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 59a98d1b..36aa5916 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1563,7 +1563,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, switch (compile_info->target_type) { case VKD3D_SHADER_TARGET_D3D_ASM: - ret = vkd3d_dxbc_binary_to_text(program, &parser->shader_desc, compile_info, out, VSIR_ASM_FLAG_NONE); + ret = d3d_asm_compile(program, compile_info, out, VSIR_ASM_FLAG_NONE); break; case VKD3D_SHADER_TARGET_GLSL: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 07b9f94c..02902900 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1404,8 +1404,8 @@ enum vsir_asm_flags VSIR_ASM_FLAG_DUMP_TYPES = 0x1, }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, - const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, +enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, enum vsir_asm_flags flags); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list);

1 0

Nikolay Sivov : vkd3d-shader: Parse a 'single' modifier.
by Alexandre Julliard March 12, 2024

March 12, 2024

Module: vkd3d Branch: master Commit: e0ef45c0a37b70f7e0ecc49605410512a6180bcd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e0ef45c0a37b70f7e0ecc49605410… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 02:51:58 2024 +0100 vkd3d-shader: Parse a 'single' modifier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 ++ tests/hlsl/cbuffer.shader_test | 60 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 1fb8b834..9781dd33 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -374,6 +374,7 @@ struct hlsl_attribute #define HLSL_STORAGE_CENTROID 0x00004000 #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 #define HLSL_STORAGE_LINEAR 0x00010000 +#define HLSL_MODIFIER_SINGLE 0x00020000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fda6f597..ec8b3d22 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6874,6 +6874,8 @@ var_modifiers: { if (!strcmp($1, "precise")) $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_PRECISE, &@1); + else if (!strcmp($1, "single")) + $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_SINGLE, &@1); else hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_UNKNOWN_MODIFIER, "Unknown modifier %s.", debugstr_a($1)); diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index bb0937ed..517fe636 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -29,11 +29,71 @@ float4 main() : sv_target return foo; } +[pixel shader fail(sm>=6)] +// The 'single' modifier is not a keyword. It's meaningful only for fx_5_0. +single cbuffer cb +{ + float4 single; +}; + +float4 main() : sv_target +{ + return single; +} + [test] uniform 0 float4 1.0 2.0 3.0 4.0 draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) +[pixel shader fail(sm>=6)] +// 'single' modifier is usable when there is a variable with the same name +cbuffer cb +{ + float4 single; +}; + +single cbuffer cb2 +{ + float4 var; +}; + +float4 main() : sv_target +{ + return single; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader] +typedef float4 single; +single var; + +float4 main() : sv_target +{ + return var; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail] +typedef float4 single; +single cbuffer cb +{ + float4 var; +}; + +float4 main() : sv_target +{ + return var; +} + % SM1 buffer offset allocation follows different rules than SM4. % Those would have to be tested separately. [require]

1 0

Nikolay Sivov : vkd3d-shader/fx: Handle 'single' modifier for buffers.
by Alexandre Julliard March 12, 2024

March 12, 2024

Module: vkd3d Branch: master Commit: 948cd2154ae858e4b33c552424fe97519ee6b6b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/948cd2154ae858e4b33c552424fe9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 20:01:22 2024 +0100 vkd3d-shader/fx: Handle 'single' modifier for buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index aaba6c28..fdf132e9 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -799,7 +799,8 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx bind_point = b->reservation.reg_index; if (b->type == HLSL_BUFFER_TEXTURE) flags |= IS_TBUFFER; - /* FIXME: set 'single' flag for fx_5_0 */ + if (ctx->profile->major_version == 5 && b->modifiers & HLSL_MODIFIER_SINGLE) + flags |= IS_SINGLE; name_offset = write_string(b->name, fx);

1 0