November 2023 - Wine-commits

Alexandre Julliard : ntdll: Set function pointers in the ARM64EC metadata on dll load.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: e4c9ec075b788148951c18f34225091969c5a957 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4c9ec075b788148951c18f3422509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 13:09:07 2023 +0100 ntdll: Set function pointers in the ARM64EC metadata on dll load. --- dlls/ntdll/loader.c | 96 +++++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/ntdll_misc.h | 13 +++++++ 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 93edc237405..89756c57433 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -241,6 +241,52 @@ static void module_push_unload_trace( const WINE_MODREF *wm ) unload_trace_ptr = unload_traces; } +#ifdef __arm64ec__ + +static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, + const IMAGE_ARM64EC_METADATA *metadata ) +{ + DWORD i, protect_old; + const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); + + if (metadata->Version != 1) + { + ERR( "unknown version %lu\n", metadata->Version ); + return; + } + + /* assume that all pointers are in the same section */ + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + { + if ((sec->VirtualAddress <= metadata->__os_arm64x_dispatch_call) && + (sec->VirtualAddress + sec->Misc.VirtualSize > metadata->__os_arm64x_dispatch_call)) + { + void *base = get_rva( module, sec->VirtualAddress ); + SIZE_T size = sec->Misc.VirtualSize; + + NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, PAGE_READWRITE, &protect_old ); + +#define SET_FUNC(func,val) *(void **)get_rva( module, metadata->func ) = val + SET_FUNC( __os_arm64x_dispatch_call, __os_arm64x_check_call ); + SET_FUNC( __os_arm64x_dispatch_call_no_redirect, __os_arm64x_dispatch_call_no_redirect ); + SET_FUNC( __os_arm64x_dispatch_fptr, __os_arm64x_dispatch_fptr ); + SET_FUNC( __os_arm64x_dispatch_icall, __os_arm64x_check_icall ); + SET_FUNC( __os_arm64x_dispatch_icall_cfg, __os_arm64x_check_icall_cfg ); + SET_FUNC( __os_arm64x_dispatch_ret, __os_arm64x_dispatch_ret ); + SET_FUNC( GetX64InformationFunctionPointer, __os_arm64x_get_x64_information ); + SET_FUNC( SetX64InformationFunctionPointer, __os_arm64x_set_x64_information ); +#undef SET_FUNC + + NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, protect_old, &protect_old ); + return; + } + } + ERR( "module %p no section found for %lx\n", module, metadata->__os_arm64x_dispatch_call ); +} + +#endif + /********************************************************************* * RtlGetUnloadEventTrace [NTDLL.@] */ @@ -1983,26 +2029,10 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, * Create a random security cookie for buffer overflow protection. Make * sure it does not accidentally match the default cookie value. */ -static void set_security_cookie( void *module, SIZE_T len ) +static void set_security_cookie( ULONG_PTR *cookie ) { static ULONG seed; - IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; - ULONG loadcfg_size; - ULONG_PTR *cookie; - - loadcfg = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (!loadcfg) return; - if (loadcfg_size < offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) return; - if (!loadcfg->SecurityCookie) return; - if (loadcfg->SecurityCookie < (ULONG_PTR)module || - loadcfg->SecurityCookie > (ULONG_PTR)module + len - sizeof(ULONG_PTR)) - { - WARN( "security cookie %p outside of image %p-%p\n", - (void *)loadcfg->SecurityCookie, module, (char *)module + len ); - return; - } - cookie = (ULONG_PTR *)loadcfg->SecurityCookie; TRACE( "initializing security cookie %p\n", cookie ); if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); @@ -2025,6 +2055,36 @@ static void set_security_cookie( void *module, SIZE_T len ) } } + +/*********************************************************************** + * update_load_config + */ +static void update_load_config( void *module ) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + ULONG size; + + cfg = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &size ); + if (!cfg) return; + size = min( size, cfg->Size ); + if (size > offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie ) && + cfg->SecurityCookie > (ULONG_PTR)module && + cfg->SecurityCookie < (ULONG_PTR)module + nt->OptionalHeader.SizeOfImage) + { + set_security_cookie( (ULONG_PTR *)cfg->SecurityCookie ); + } +#ifdef __arm64ec__ + if (size > offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer ) && + cfg->CHPEMetadataPointer > (ULONG_PTR)module && + cfg->CHPEMetadataPointer < (ULONG_PTR)module + nt->OptionalHeader.SizeOfImage) + { + update_hybrid_metadata( module, nt, (void *)cfg->CHPEMetadataPointer ); + } +#endif +} + + static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T len ) { char *base; @@ -2135,7 +2195,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (image_info->ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; wm->system = system; - set_security_cookie( *module, map_size ); + update_load_config( *module ); /* fixup imports */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8d489afda7f..d24bd0c887a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -131,4 +131,17 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) extern TEB_FLS_DATA *fls_alloc_data(void) DECLSPEC_HIDDEN; extern void heap_thread_detach(void) DECLSPEC_HIDDEN; +#ifdef __arm64ec__ + +extern void *__os_arm64x_check_call; +extern void *__os_arm64x_check_icall; +extern void *__os_arm64x_check_icall_cfg; +extern void *__os_arm64x_dispatch_call_no_redirect; +extern void *__os_arm64x_dispatch_fptr; +extern void *__os_arm64x_dispatch_ret; +extern void *__os_arm64x_get_x64_information; +extern void *__os_arm64x_set_x64_information; + +#endif + #endif

1 0

Alexandre Julliard : ntdll: Implement __os_arm64x_check_call().
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 36036b9b60af330c50dc7cbda3d0c238937017f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/36036b9b60af330c50dc7cbda3d0c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 13:35:15 2023 +0100 ntdll: Implement __os_arm64x_check_call(). --- dlls/ntdll/signal_arm64ec.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index be22278a252..f17cbdaf063 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -159,6 +159,102 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +static int code_match( BYTE *code, const BYTE *seq, size_t len ) +{ + for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; + return 1; +} + +void *check_call( void **target, void *exit_thunk, void *dest ) +{ + static const BYTE jmp_sequence[] = + { + 0xff, 0x25 /* jmp *xxx(%rip) */ + }; + static const BYTE fast_forward_sequence[] = + { + 0x48, 0x8b, 0xc4, /* mov %rsp,%rax */ + 0x48, 0x89, 0x58, 0x20, /* mov %rbx,0x20(%rax) */ + 0x55, /* push %rbp */ + 0x5d, /* pop %rbp */ + 0xe9 /* jmp arm_code */ + }; + static const BYTE syscall_sequence[] = + { + 0x4c, 0x8b, 0xd1, /* mov %rcx,%r10 */ + 0xb8, 0, 0, 0, 0, /* mov $xxx,%eax */ + 0xf6, 0x04, 0x25, 0x08, /* testb $0x1,0x7ffe0308 */ + 0x03, 0xfe, 0x7f, 0x01, + 0x75, 0x03, /* jne 1f */ + 0x0f, 0x05, /* syscall */ + 0xc3, /* ret */ + 0xcd, 0x2e, /* 1: int $0x2e */ + 0xc3 /* ret */ + }; + + for (;;) + { + if (dest == __wine_unix_call_dispatcher) return dest; + if (RtlIsEcCode( dest )) return dest; + if (code_match( dest, jmp_sequence, sizeof(jmp_sequence) )) + { + int *off_ptr = (int *)((char *)dest + sizeof(jmp_sequence)); + void **addr_ptr = (void **)((char *)(off_ptr + 1) + *off_ptr); + dest = *addr_ptr; + continue; + } + if (!((ULONG_PTR)dest & 15)) /* fast-forward and syscall thunks are always aligned */ + { + if (code_match( dest, fast_forward_sequence, sizeof(fast_forward_sequence) )) + { + int *off_ptr = (int *)((char *)dest + sizeof(fast_forward_sequence)); + return (char *)(off_ptr + 1) + *off_ptr; + } + if (code_match( dest, syscall_sequence, sizeof(syscall_sequence) )) + { + ULONG id = ((ULONG *)dest)[1]; + FIXME( "syscall %x at %p not implemented\n", id, dest ); + } + } + *target = dest; + return exit_thunk; + } +} + +static void __attribute__((naked)) arm64x_check_call(void) +{ + asm( "stp x29, x30, [sp,#-0xb0]!\n\t" + "mov x29, sp\n\t" + "stp x0, x1, [sp, #0x10]\n\t" + "stp x2, x3, [sp, #0x20]\n\t" + "stp x4, x5, [sp, #0x30]\n\t" + "stp x6, x7, [sp, #0x40]\n\t" + "stp x8, x9, [sp, #0x50]\n\t" + "stp x10, x15, [sp, #0x60]\n\t" + "stp d0, d1, [sp, #0x70]\n\t" + "stp d2, d3, [sp, #0x80]\n\t" + "stp d4, d5, [sp, #0x90]\n\t" + "stp d6, d7, [sp, #0xa0]\n\t" + "add x0, sp, #0x58\n\t" /* x9 = &target */ + "mov x1, x10\n\t" /* x10 = exit_thunk */ + "mov x2, x11\n\t" /* x11 = dest */ + "bl " __ASM_NAME("check_call") "\n\t" + "mov x11, x0\n\t" + "ldp x0, x1, [sp, #0x10]\n\t" + "ldp x2, x3, [sp, #0x20]\n\t" + "ldp x4, x5, [sp, #0x30]\n\t" + "ldp x6, x7, [sp, #0x40]\n\t" + "ldp x8, x9, [sp, #0x50]\n\t" + "ldp x10, x15, [sp, #0x60]\n\t" + "ldp d0, d1, [sp, #0x70]\n\t" + "ldp d2, d3, [sp, #0x80]\n\t" + "ldp d4, d5, [sp, #0x90]\n\t" + "ldp d6, d7, [sp, #0xa0]\n\t" + "ldp x29, x30, [sp], #0xb0\n\t" + "ret" ); +} + + /************************************************************************** * __chkstk (NTDLL.@) * @@ -212,6 +308,13 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) */ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { + if (!__os_arm64x_check_call) + { + __os_arm64x_check_call = arm64x_check_call; + __os_arm64x_check_icall = arm64x_check_call; + __os_arm64x_check_icall_cfg = arm64x_check_call; + } + loader_init( context, (void **)&context->Rcx ); TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Rcx, (void *)context->Rdx ); NtContinue( context, TRUE );

1 0

Alexandre Julliard : ntdll: Implement __os_arm64x_get/set_x64_information().
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 56409f2c79dec68a869c0b6b45a8bb85438aebb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/56409f2c79dec68a869c0b6b45a8bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 14:19:20 2023 +0100 ntdll: Implement __os_arm64x_get/set_x64_information(). --- dlls/ntdll/signal_arm64ec.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f17cbdaf063..a71e3214aeb 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -36,6 +36,96 @@ WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(relay); +static UINT64 mxcsr_to_fpcsr( UINT mxcsr ) +{ + UINT fpcr = 0, fpsr = 0; + + if (mxcsr & 0x0001) fpsr |= 0x0001; /* invalid operation */ + if (mxcsr & 0x0002) fpsr |= 0x0080; /* denormal */ + if (mxcsr & 0x0004) fpsr |= 0x0002; /* zero-divide */ + if (mxcsr & 0x0008) fpsr |= 0x0004; /* overflow */ + if (mxcsr & 0x0010) fpsr |= 0x0008; /* underflow */ + if (mxcsr & 0x0020) fpsr |= 0x0010; /* precision */ + + if (mxcsr & 0x0040) fpcr |= 0x0001; /* denormals are zero */ + if (mxcsr & 0x0080) fpcr |= 0x0100; /* invalid operation mask */ + if (mxcsr & 0x0100) fpcr |= 0x8000; /* denormal mask */ + if (mxcsr & 0x0200) fpcr |= 0x0200; /* zero-divide mask */ + if (mxcsr & 0x0400) fpcr |= 0x0400; /* overflow mask */ + if (mxcsr & 0x0800) fpcr |= 0x0800; /* underflow mask */ + if (mxcsr & 0x1000) fpcr |= 0x1000; /* precision mask */ + if (mxcsr & 0x2000) fpcr |= 0x800000; /* round down */ + if (mxcsr & 0x4000) fpcr |= 0x400000; /* round up */ + if (mxcsr & 0x8000) fpcr |= 0x1000000; /* flush to zero */ + return fpcr | ((UINT64)fpsr << 32); +} + +static UINT fpcsr_to_mxcsr( UINT fpcr, UINT fpsr ) +{ + UINT ret = 0; + + if (fpsr & 0x0001) ret |= 0x0001; /* invalid operation */ + if (fpsr & 0x0002) ret |= 0x0004; /* zero-divide */ + if (fpsr & 0x0004) ret |= 0x0008; /* overflow */ + if (fpsr & 0x0008) ret |= 0x0010; /* underflow */ + if (fpsr & 0x0010) ret |= 0x0020; /* precision */ + if (fpsr & 0x0080) ret |= 0x0002; /* denormal */ + + if (fpcr & 0x0000001) ret |= 0x0040; /* denormals are zero */ + if (fpcr & 0x0000100) ret |= 0x0080; /* invalid operation mask */ + if (fpcr & 0x0000200) ret |= 0x0200; /* zero-divide mask */ + if (fpcr & 0x0000400) ret |= 0x0400; /* overflow mask */ + if (fpcr & 0x0000800) ret |= 0x0800; /* underflow mask */ + if (fpcr & 0x0001000) ret |= 0x1000; /* precision mask */ + if (fpcr & 0x0008000) ret |= 0x0100; /* denormal mask */ + if (fpcr & 0x0400000) ret |= 0x4000; /* round up */ + if (fpcr & 0x0800000) ret |= 0x2000; /* round down */ + if (fpcr & 0x1000000) ret |= 0x8000; /* flush to zero */ + return ret; +} + + +/*********************************************************************** + * LdrpGetX64Information + */ +static NTSTATUS WINAPI LdrpGetX64Information( ULONG type, void *output, void *extra_info ) +{ + switch (type) + { + case 0: + { + UINT64 fpcr, fpsr; + + __asm__ __volatile__( "mrs %0, fpcr; mrs %1, fpsr" : "=r" (fpcr), "=r" (fpsr) ); + *(UINT *)output = fpcsr_to_mxcsr( fpcr, fpsr ); + return STATUS_SUCCESS; + } + default: + FIXME( "not implemented type %u\n", type ); + return STATUS_INVALID_PARAMETER; + } +} + +/*********************************************************************** + * LdrpSetX64Information + */ +static NTSTATUS WINAPI LdrpSetX64Information( ULONG type, ULONG_PTR input, void *extra_info ) +{ + switch (type) + { + case 0: + { + UINT64 fpcsr = mxcsr_to_fpcsr( input ); + __asm__ __volatile__( "msr fpcr, %0; msr fpsr, %1" :: "r" (fpcsr), "r" (fpcsr >> 32) ); + return STATUS_SUCCESS; + } + default: + FIXME( "not implemented type %u\n", type ); + return STATUS_INVALID_PARAMETER; + } +} + + /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ @@ -313,6 +403,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 __os_arm64x_check_call = arm64x_check_call; __os_arm64x_check_icall = arm64x_check_call; __os_arm64x_check_icall_cfg = arm64x_check_call; + __os_arm64x_get_x64_information = LdrpGetX64Information; + __os_arm64x_set_x64_information = LdrpSetX64Information; } loader_init( context, (void **)&context->Rcx );

1 0

Conor McCarthy : vkd3d: Introduce struct d3d12_pipeline_state_desc for graphics pipelines.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 39afbb8e323030adbcc7287cc6ea67fe5f57ba48 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/39afbb8e323030adbcc7287cc6ea6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 12:49:17 2023 +1000 vkd3d: Introduce struct d3d12_pipeline_state_desc for graphics pipelines. A generic container for both compute and graphics pipeline descriptions to facilitate reading the description from a stream. --- libs/vkd3d/state.c | 130 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 25 +++++++++ 2 files changed, 105 insertions(+), 50 deletions(-)

1 0

Conor McCarthy : vkd3d: Use struct d3d12_pipeline_state_desc for compute pipelines.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 6196199a891d838433d115e2772273c4c67292a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6196199a891d838433d115e277227… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 13:03:38 2023 +1000 vkd3d: Use struct d3d12_pipeline_state_desc for compute pipelines. --- libs/vkd3d/state.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e3fac7e..a1cad3d4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1763,6 +1763,17 @@ static void pipeline_state_desc_from_d3d12_graphics_desc(struct d3d12_pipeline_s desc->flags = d3d12_desc->Flags; } +static void pipeline_state_desc_from_d3d12_compute_desc(struct d3d12_pipeline_state_desc *desc, + const D3D12_COMPUTE_PIPELINE_STATE_DESC *d3d12_desc) +{ + memset(desc, 0, sizeof(*desc)); + desc->root_signature = d3d12_desc->pRootSignature; + desc->cs = d3d12_desc->CS; + desc->node_mask = d3d12_desc->NodeMask; + desc->cached_pso = d3d12_desc->CachedPSO; + desc->flags = d3d12_desc->Flags; +} + struct vkd3d_pipeline_key { D3D12_PRIMITIVE_TOPOLOGY topology; @@ -2220,7 +2231,7 @@ static HRESULT d3d12_pipeline_state_find_and_init_uav_counters(struct d3d12_pipe } static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *state, - struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) + struct d3d12_device *device, const struct d3d12_pipeline_state_desc *desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_interface_info shader_interface; @@ -2235,14 +2246,14 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st memset(&state->uav_counters, 0, sizeof(state->uav_counters)); - if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) + if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->root_signature))) { WARN("Root signature is NULL.\n"); return E_INVALIDARG; } if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature, - &desc->CS, VK_SHADER_STAGE_COMPUTE_BIT))) + &desc->cs, VK_SHADER_STAGE_COMPUTE_BIT))) return hr; memset(&target_info, 0, sizeof(target_info)); @@ -2283,7 +2294,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st vk_pipeline_layout = state->uav_counters.vk_pipeline_layout ? state->uav_counters.vk_pipeline_layout : root_signature->vk_pipeline_layout; - if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->CS, &shader_interface, + if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->cs, &shader_interface, vk_pipeline_layout, &state->u.compute.vk_pipeline))) { WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); @@ -2307,13 +2318,16 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) { + struct d3d12_pipeline_state_desc pipeline_desc; struct d3d12_pipeline_state *object; HRESULT hr; + pipeline_state_desc_from_d3d12_compute_desc(&pipeline_desc, desc); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_pipeline_state_init_compute(object, device, desc))) + if (FAILED(hr = d3d12_pipeline_state_init_compute(object, device, &pipeline_desc))) { vkd3d_free(object); return hr;

1 0

Conor McCarthy : vkd3d: Implement ID3D12Device2::CreatePipelineState().
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: d8ba0d2a1102a0d6774940e6060ea1b14046334e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8ba0d2a1102a0d6774940e6060ea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 13:07:03 2023 +1000 vkd3d: Implement ID3D12Device2::CreatePipelineState(). --- libs/vkd3d/device.c | 11 ++- libs/vkd3d/state.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 3 + 3 files changed, 204 insertions(+), 2 deletions(-)

1 0

Conor McCarthy : tests: Test CreatePipelineState().
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 63b8972b0e5d6aef67333e5f1af1fcb9a22cb35b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/63b8972b0e5d6aef67333e5f1af1f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 18 14:21:48 2023 +1000 tests: Test CreatePipelineState(). Based on vkd3d-proton patches by Hans-Kristian Arntzen and Philip Rebohle. --- tests/d3d12.c | 476 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 476 insertions(+)

1 0

Conor McCarthy : vkd3d: Support depth bounds test.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 76eb0adf03a9fa8858d0b86b54966e2d0029035f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76eb0adf03a9fa8858d0b86b54966… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 18 15:50:18 2023 +1000 vkd3d: Support depth bounds test. --- libs/vkd3d/device.c | 4 +--- libs/vkd3d/state.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a158697b..79028fc3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1522,9 +1522,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options1.ExpandedComputeResourceStates = TRUE; device->feature_options1.Int64ShaderOps = features->shaderInt64; - /* Depth bounds test is enabled in D3D12_DEPTH_STENCIL_DESC1, which is not - * supported. */ - device->feature_options2.DepthBoundsTestSupported = FALSE; + device->feature_options2.DepthBoundsTestSupported = features->depthBounds; /* d3d12_command_list_SetSamplePositions() is not implemented. */ device->feature_options2.ProgrammableSamplePositionsTier = D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 47dbb208..de0e04ea 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2659,7 +2659,7 @@ static void ds_desc_from_d3d12(struct VkPipelineDepthStencilStateCreateInfo *vk_ vk_desc->depthWriteEnable = VK_FALSE; vk_desc->depthCompareOp = VK_COMPARE_OP_NEVER; } - vk_desc->depthBoundsTestEnable = VK_FALSE; + vk_desc->depthBoundsTestEnable = d3d12_desc->DepthBoundsTestEnable; if ((vk_desc->stencilTestEnable = d3d12_desc->StencilEnable)) { vk_stencil_op_state_from_d3d12(&vk_desc->front, &d3d12_desc->FrontFace, @@ -3068,6 +3068,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->rt_count = rt_count; ds_desc_from_d3d12(&graphics->ds_desc, &desc->depth_stencil_state); + if (graphics->ds_desc.depthBoundsTestEnable && !device->feature_options2.DepthBoundsTestSupported) + { + WARN("Depth bounds test not supported by device.\n"); + hr = E_INVALIDARG; + goto fail; + } if (desc->dsv_format == DXGI_FORMAT_UNKNOWN && graphics->ds_desc.depthTestEnable && !graphics->ds_desc.depthWriteEnable && graphics->ds_desc.depthCompareOp == VK_COMPARE_OP_ALWAYS && !graphics->ds_desc.stencilTestEnable) @@ -3077,7 +3083,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->dsv_format = VK_FORMAT_UNDEFINED; - if (graphics->ds_desc.depthTestEnable || graphics->ds_desc.stencilTestEnable) + if (graphics->ds_desc.depthTestEnable || graphics->ds_desc.stencilTestEnable + || graphics->ds_desc.depthBoundsTestEnable) { if (desc->dsv_format == DXGI_FORMAT_UNKNOWN) {

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add a helper to check for a numeric type.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 88caf877893f675cf3dc999a843b9e03b0e58b0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88caf877893f675cf3dc999a843b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 02:05:50 2023 +0100 vkd3d-shader/hlsl: Add a helper to check for a numeric type. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 5 +++++ libs/vkd3d-shader/hlsl.y | 26 +++++++++++++------------- libs/vkd3d-shader/hlsl_codegen.c | 10 +++++----- libs/vkd3d-shader/tpf.c | 2 +- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 593ca0a3..501bff8c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -220,7 +220,7 @@ bool hlsl_type_is_resource(const struct hlsl_type *type) * resources, since for both their data types span across a single regset. */ static enum hlsl_regset type_get_regset(const struct hlsl_type *type) { - if (type->class <= HLSL_CLASS_LAST_NUMERIC) + if (hlsl_is_numeric_type(type)) return HLSL_REGSET_NUMERIC; if (type->class == HLSL_CLASS_ARRAY) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 615529c1..f3596764 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1105,6 +1105,11 @@ static inline struct hlsl_type *hlsl_get_numeric_type(const struct hlsl_ctx *ctx return hlsl_get_matrix_type(ctx, base_type, dimx, dimy); } +static inline bool hlsl_is_numeric_type(const struct hlsl_type *type) +{ + return type->class <= HLSL_CLASS_LAST_NUMERIC; +} + static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) { switch (dim) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e8f84fe6..5e0d48d3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -211,7 +211,7 @@ static bool hlsl_types_are_componentwise_equal(struct hlsl_ctx *ctx, struct hlsl return true; } -static bool type_contains_only_numerics(struct hlsl_type *type) +static bool type_contains_only_numerics(const struct hlsl_type *type) { unsigned int i; @@ -226,12 +226,12 @@ static bool type_contains_only_numerics(struct hlsl_type *type) } return true; } - return type->class <= HLSL_CLASS_LAST_NUMERIC; + return hlsl_is_numeric_type(type); } static bool explicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) { - if (src->class <= HLSL_CLASS_LAST_NUMERIC && src->dimx == 1 && src->dimy == 1 && type_contains_only_numerics(dst)) + if (hlsl_is_numeric_type(src) && src->dimx == 1 && src->dimy == 1 && type_contains_only_numerics(dst)) return true; if (src->class == HLSL_CLASS_MATRIX && dst->class == HLSL_CLASS_MATRIX @@ -251,10 +251,10 @@ static bool explicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_typ static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) { - if ((src->class <= HLSL_CLASS_LAST_NUMERIC) != (dst->class <= HLSL_CLASS_LAST_NUMERIC)) + if (hlsl_is_numeric_type(src) != hlsl_is_numeric_type(dst)) return false; - if (src->class <= HLSL_CLASS_LAST_NUMERIC) + if (hlsl_is_numeric_type(src)) { /* Scalar vars can be converted to any other numeric data type */ if (src->dimx == 1 && src->dimy == 1) @@ -311,7 +311,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct hlsl_block *bl struct hlsl_ir_var *var; unsigned int dst_idx; - broadcast = src_type->class <= HLSL_CLASS_LAST_NUMERIC && src_type->dimx == 1 && src_type->dimy == 1; + broadcast = hlsl_is_numeric_type(src_type) && src_type->dimx == 1 && src_type->dimy == 1; matrix_cast = !broadcast && dst_comp_count != src_comp_count && src_type->class == HLSL_CLASS_MATRIX && dst_type->class == HLSL_CLASS_MATRIX; assert(src_comp_count >= dst_comp_count || broadcast); @@ -1292,7 +1292,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct hlsl_type *t2, const struct vkd3d_shader_location *loc, enum hlsl_type_class *type, unsigned int *dimx, unsigned int *dimy) { - if (t1->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type(t1)) { struct vkd3d_string_buffer *string; @@ -1303,7 +1303,7 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct return false; } - if (t2->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type(t2)) { struct vkd3d_string_buffer *string; @@ -1775,7 +1775,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo return NULL; } - if (lhs_type->class <= HLSL_CLASS_LAST_NUMERIC) + if (hlsl_is_numeric_type(lhs_type)) writemask = (1 << lhs_type->dimx) - 1; if (!(rhs = add_implicit_conversion(ctx, block, rhs, lhs_type, &rhs->loc))) @@ -2005,7 +2005,7 @@ static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_s static bool type_has_numeric_components(struct hlsl_type *type) { - if (type->class <= HLSL_CLASS_LAST_NUMERIC) + if (hlsl_is_numeric_type(type)) return true; if (type->class == HLSL_CLASS_ARRAY) return type_has_numeric_components(type->e.array.type); @@ -3926,7 +3926,7 @@ static struct hlsl_block *add_call(struct hlsl_ctx *ctx, const char *name, for (i = 0; i < args->args_count; ++i) { - if (args->args[i]->data_type->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type(args->args[i]->data_type)) { struct vkd3d_string_buffer *string; @@ -6776,7 +6776,7 @@ postfix_expr: YYABORT; $$ = $1; } - else if (node->data_type->class <= HLSL_CLASS_LAST_NUMERIC) + else if (hlsl_is_numeric_type(node->data_type)) { struct hlsl_ir_node *swizzle; @@ -6819,7 +6819,7 @@ postfix_expr: free_parse_initializer(&$4); YYABORT; } - if ($2->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type($2)) { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 598d6c66..5a70878b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -229,7 +229,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, static void validate_field_semantic(struct hlsl_ctx *ctx, struct hlsl_struct_field *field) { - if (!field->semantic.name && hlsl_get_multiarray_element_type(field->type)->class <= HLSL_CLASS_LAST_NUMERIC + if (!field->semantic.name && hlsl_is_numeric_type(hlsl_get_multiarray_element_type(field->type)) && !field->semantic.reported_missing) { hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, @@ -339,7 +339,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, s struct hlsl_ir_node *c; unsigned int i; - if (type->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type(type)) { struct vkd3d_string_buffer *string; if (!(string = hlsl_type_to_string(ctx, type))) @@ -481,7 +481,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, s struct hlsl_ir_node *c; unsigned int i; - if (type->class > HLSL_CLASS_LAST_NUMERIC) + if (!hlsl_is_numeric_type(type)) { struct vkd3d_string_buffer *string; if (!(string = hlsl_type_to_string(ctx, type))) @@ -3942,7 +3942,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, constant->reg = allocate_numeric_registers_for_type(ctx, allocator, 1, UINT_MAX, type); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); - assert(type->class <= HLSL_CLASS_LAST_NUMERIC); + assert(hlsl_is_numeric_type(type)); assert(type->dimy == 1); assert(constant->reg.writemask); @@ -4634,7 +4634,7 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); assert(deref->data_type); - assert(deref->data_type->class <= HLSL_CLASS_LAST_NUMERIC); + assert(hlsl_is_numeric_type(deref->data_type)); ret.id += offset / 4; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 60fa3b98..594438a2 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5411,7 +5411,7 @@ static void write_sm4_load(const struct tpf_writer *tpf, const struct hlsl_ir_lo sm4_dst_from_node(&instr.dsts[0], &load->node); instr.dst_count = 1; - assert(type->class <= HLSL_CLASS_LAST_NUMERIC); + assert(hlsl_is_numeric_type(type)); if (type->base_type == HLSL_TYPE_BOOL && var_is_user_input(tpf->ctx, load->src.var)) { struct hlsl_constant_value value;

1 0

Conor McCarthy : include: Add a D3D12_RT_FORMAT_ARRAY typedef.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: vkd3d Branch: master Commit: 529c0f46b02b5aa396d8d1a6ef7e2a644cc4cb76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/529c0f46b02b5aa396d8d1a6ef7e2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 11:13:21 2023 +1000 include: Add a D3D12_RT_FORMAT_ARRAY typedef. For consistency with how other D3D12_* structs are declared. --- include/vkd3d_d3d12.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9b1b494c..cdd3acec 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2129,11 +2129,11 @@ typedef struct D3D12_PIPELINE_STATE_STREAM_DESC void *pPipelineStateSubobjectStream; } D3D12_PIPELINE_STATE_STREAM_DESC; -struct D3D12_RT_FORMAT_ARRAY +typedef struct D3D12_RT_FORMAT_ARRAY { DXGI_FORMAT RTFormats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; UINT NumRenderTargets; -}; +} D3D12_RT_FORMAT_ARRAY; typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE {

1 0