May 2020 - Wine-commits - list.winehq.org

Paul Gofman : ntoskrnl.exe: Add KeQueryActiveProcessorCountEx() function.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2716e215df3aff2ccf2635289d10b938fdfc2069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2716e215df3aff2ccf263528… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 22 20:37:43 2020 +0300 ntoskrnl.exe: Add KeQueryActiveProcessorCountEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/tests/driver.c | 31 +++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + include/winnt.h | 2 ++ 5 files changed, 41 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1259797f8..6d9ae44808 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2385,6 +2385,12 @@ KAFFINITY WINAPI KeQueryActiveProcessors( void ) return AffinityMask; } +ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number) +{ + TRACE("group_number %u.\n", group_number); + + return GetActiveProcessorCount(group_number); +} /********************************************************************** * KeQueryInterruptTime (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0490dcd691..f25ab9c5e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,6 +587,7 @@ @ stub KeProfileInterruptWithSource @ stub KePulseEvent @ stdcall KeQueryActiveProcessors() +@ stdcall KeQueryActiveProcessorCountEx(long) @ stdcall KeQueryInterruptTime() @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 10f3865515..65be4a8d35 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1710,6 +1710,36 @@ static void test_executable_pool(void) } #endif +static void test_affinity(void) +{ + ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT); + KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void); + ULONG cpu_count, count; + KAFFINITY mask; + + pKeQueryActiveProcessorCountEx = get_proc_address("KeQueryActiveProcessorCountEx"); + if (!pKeQueryActiveProcessorCountEx) + { + win_skip("KeQueryActiveProcessorCountEx is not available.\n"); + return; + } + + pKeQueryActiveProcessors = get_proc_address("KeQueryActiveProcessors"); + ok(!!pKeQueryActiveProcessors, "KeQueryActiveProcessors is not available.\n"); + + count = pKeQueryActiveProcessorCountEx(1); + todo_wine ok(!count, "Got unexpected count %u.\n", count); + + cpu_count = pKeQueryActiveProcessorCountEx(0); + ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count); + + count = pKeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); + ok(count == cpu_count, "Got unexpected count %u.\n", count); + + mask = pKeQueryActiveProcessors(); + ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1763,6 +1793,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st #if defined(__i386__) || defined(__x86_64__) test_executable_pool(); #endif + test_affinity(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5b1f19e4f1..790d1a1247 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1696,6 +1696,7 @@ void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); void WINAPI KeLeaveCriticalRegion(void); +ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT); KAFFINITY WINAPI KeQueryActiveProcessors(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); diff --git a/include/winnt.h b/include/winnt.h index 1f0a7e344e..3e3ac338bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6501,6 +6501,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; +#define ALL_PROCESSOR_GROUPS 0xffff + typedef struct _PROCESSOR_NUMBER { WORD Group;

1 0

Matteo Bruni : ntdll: Use memcpy() in set_float_reg().
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2e5c2c7cdb11cae3a2b78bb0794368f431538efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5c2c7cdb11cae3a2b78bb0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 22 20:39:59 2020 +0200 ntdll: Use memcpy() in set_float_reg(). The source address might not be aligned although the compiler can expect alignment when using a plain assignment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 31af1e98d3..e92470e960 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3298,7 +3298,8 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = *val; + /* Use a memcpy() to avoid issues if val is misaligned. */ + memcpy(&context->u.s.Xmm0 + reg, val, sizeof(*val)); if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; }

1 0

Zebediah Figura : amstream: Simplify flush_receive_queue() a bit.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 410934a762a048fbff8d35927a70ce55f97a9d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410934a762a048fbff8d3592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 16:25:51 2020 -0500 amstream: Simplify flush_receive_queue() a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 68b8b84f50..4e82d76da0 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -95,13 +95,10 @@ static void remove_queued_update(IAudioStreamSampleImpl *sample) static void flush_receive_queue(struct audio_stream *stream) { - while (!list_empty(&stream->receive_queue)) - { - struct queued_receive *receive = - LIST_ENTRY(list_head(&stream->receive_queue), struct queued_receive, entry); + struct list *entry; - remove_queued_receive(receive); - } + while ((entry = list_head(&stream->receive_queue))) + remove_queued_receive(LIST_ENTRY(entry, struct queued_receive, entry)); } static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive)

1 0

Damjan Jovanovic : libwine: Fix a regression in the return value check for mmap() on FreeBSD.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: e0138c4a6a7a87f1d25badd43e05490e706bc666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0138c4a6a7a87f1d25badd4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 11:01:49 2020 +0200 libwine: Fix a regression in the return value check for mmap() on FreeBSD. This fixes a regression from my previous patch in commit 55ba3648379d90642f174e74809b84130d6d1ddc, which was checking for mmap() returning NULL instead of MAP_FAILED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0fbe2efea7..af91b3e352 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) + if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) return start; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) )

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_EXISTING_HEAPS.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: 0b622c6704e31ba34529ad049d6a3fbf08fb8a27 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0b622c6704e31ba34529ad0… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:07 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_EXISTING_HEAPS. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/device.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 0982483..a8aaf95 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1697,6 +1697,11 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS3 BOOL BarycentricsSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS3; +typedef struct D3D12_FEATURE_DATA_EXISTING_HEAPS +{ + BOOL Supported; +} D3D12_FEATURE_DATA_EXISTING_HEAPS; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1714,6 +1719,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_SHADER_CACHE = 19, D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, D3D12_FEATURE_D3D12_OPTIONS3 = 21, + D3D12_FEATURE_EXISTING_HEAPS = 22, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 359da7f..c0f1b39 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2842,6 +2842,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_EXISTING_HEAPS: + { + D3D12_FEATURE_DATA_EXISTING_HEAPS *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->Supported = FALSE; + + TRACE("Existing heaps %#x.\n", data->Supported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS3.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: 33217ebfca795aa204f9369cfa994a791e96a036 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33217ebfca795aa204f9369… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:06 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS3. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 30 ++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 28 ++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 59 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e8b27bb..0982483 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -200,6 +200,26 @@ typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, } D3D12_SHADER_CACHE_SUPPORT_FLAGS; +typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS +{ + D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE = 0x0, + D3D12_COMMAND_LIST_SUPPORT_FLAG_DIRECT = 0x1, + D3D12_COMMAND_LIST_SUPPORT_FLAG_BUNDLE = 0x2, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COMPUTE = 0x4, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COPY = 0x8, + D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_DECODE = 0x10, + D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = 0x20, + D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_ENCODE = 0x40, +} D3D12_COMMAND_LIST_SUPPORT_FLAGS; + +typedef enum D3D12_VIEW_INSTANCING_TIER +{ + D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED = 0x0, + D3D12_VIEW_INSTANCING_TIER_1 = 0x1, + D3D12_VIEW_INSTANCING_TIER_2 = 0x2, + D3D12_VIEW_INSTANCING_TIER_3 = 0x3, +} D3D12_VIEW_INSTANCING_TIER; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1668,6 +1688,15 @@ typedef struct D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY BOOL PriorityForTypeIsSupported; } D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS3 +{ + BOOL CopyQueueTimestampQueriesSupported; + BOOL CastingFullyTypedFormatSupported; + D3D12_COMMAND_LIST_SUPPORT_FLAGS WriteBufferImmediateSupportFlags; + D3D12_VIEW_INSTANCING_TIER ViewInstancingTier; + BOOL BarycentricsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS3; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1684,6 +1713,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS2 = 18, D3D12_FEATURE_SHADER_CACHE = 19, D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, + D3D12_FEATURE_D3D12_OPTIONS3 = 21, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d3cfff2..359da7f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1350,6 +1350,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, /* d3d12_command_list_SetSamplePositions() is not implemented. */ device->feature_options2.ProgrammableSamplePositionsTier = D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED; + device->feature_options3.CopyQueueTimestampQueriesSupported = FALSE; + device->feature_options3.CastingFullyTypedFormatSupported = FALSE; + device->feature_options3.WriteBufferImmediateSupportFlags = D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE; + device->feature_options3.ViewInstancingTier = D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED; + device->feature_options3.BarycentricsSupported = FALSE; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -1604,6 +1610,8 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, else goto out_destroy_queues; + device->feature_options3.CopyQueueTimestampQueriesSupported = !!device->copy_queue->timestamp_bits; + return S_OK; out_destroy_queues: @@ -2814,6 +2822,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * } } + case D3D12_FEATURE_D3D12_OPTIONS3: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS3 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options3; + + TRACE("Copy queue timestamp queries %#x.\n", data->CopyQueueTimestampQueriesSupported); + TRACE("Casting fully typed format %#x.\n", data->CastingFullyTypedFormatSupported); + TRACE("Write buffer immediate %#x.\n", data->WriteBufferImmediateSupportFlags); + TRACE("View instancing tier %#x.\n", data->ViewInstancingTier); + TRACE("Barycentrics %#x.\n", data->BarycentricsSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2559824..20134a8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1133,6 +1133,7 @@ struct d3d12_device D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; + D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; struct vkd3d_vulkan_info vk_info;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS4.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: 3a586c9ffcd37cb43176c553446d76b5cb305f4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a586c9ffcd37cb43176c55… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:08 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS4. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 14 +++++++++++++ libs/vkd3d/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 66 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a8aaf95..e7e05fe 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -220,6 +220,12 @@ typedef enum D3D12_VIEW_INSTANCING_TIER D3D12_VIEW_INSTANCING_TIER_3 = 0x3, } D3D12_VIEW_INSTANCING_TIER; +typedef enum D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER +{ + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0 = 0x0, + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_1 = 0x1, +} D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1702,6 +1708,13 @@ typedef struct D3D12_FEATURE_DATA_EXISTING_HEAPS BOOL Supported; } D3D12_FEATURE_DATA_EXISTING_HEAPS; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS4 +{ + BOOL MSAA64KBAlignedTextureSupported; + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER SharedResourceCompatibilityTier; + BOOL Native16BitShaderOpsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS4; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1720,6 +1733,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, D3D12_FEATURE_D3D12_OPTIONS3 = 21, D3D12_FEATURE_EXISTING_HEAPS = 22, + D3D12_FEATURE_D3D12_OPTIONS4 = 23, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c0f1b39..878ca74 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1356,6 +1356,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options3.ViewInstancingTier = D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED; device->feature_options3.BarycentricsSupported = FALSE; + device->feature_options4.MSAA64KBAlignedTextureSupported = FALSE; + device->feature_options4.SharedResourceCompatibilityTier = D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0; + /* An SM 6.2 feature. This would require features->shaderInt16 and + * VK_KHR_shader_float16_int8. */ + device->feature_options4.Native16BitShaderOpsSupported = FALSE; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -1704,6 +1710,31 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, return S_OK; } +/* The 4 MiB alignment requirement for MSAA resources was lowered to 64KB on + * hardware that supports it. This is distinct from the small MSAA requirement + * which applies to resources of a total size of 4 MiB or less. */ +static bool d3d12_is_64k_msaa_supported(struct d3d12_device *device) +{ + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_RESOURCE_DESC resource_desc; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1024; + resource_desc.Height = 1025; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + /* FIXME: in some cases Vulkan requires 0x20000 or more for non-MSAA + * resources, which must have 0x10000 in their description, so we might + * reasonably return true here for 0x20000 or 0x40000. */ + return SUCCEEDED(vkd3d_get_image_allocation_info(device, &resource_desc, &info)) + && info.Alignment <= 0x10000; +} + static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info) { @@ -1801,6 +1832,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return hr; } + device->feature_options4.MSAA64KBAlignedTextureSupported = d3d12_is_64k_msaa_supported(device); + TRACE("Created Vulkan device %p.\n", vk_device); return hr; @@ -2858,6 +2891,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS4: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS4 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options4; + + TRACE("64 KiB aligned MSAA textures %#x.\n", data->MSAA64KBAlignedTextureSupported); + TRACE("Shared resource compatibility tier %#x.\n", data->SharedResourceCompatibilityTier); + TRACE("Native 16-bit shader ops %#x.\n", data->Native16BitShaderOpsSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 20134a8..da3e3fe 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1134,6 +1134,7 @@ struct d3d12_device D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; + D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4; struct vkd3d_vulkan_info vk_info;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_CROSS_NODE.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: d5ad90a81ed054d7d2da52857e8b2702e512255a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d5ad90a81ed054d7d2da528… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:10 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_CROSS_NODE. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index c258b8f..f27084f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1727,6 +1727,12 @@ typedef struct D3D12_FEATURE_DATA_SERIALIZATION D3D12_HEAP_SERIALIZATION_TIER HeapSerializationTier; } D3D12_FEATURE_DATA_SERIALIZATION; +typedef struct D3D12_FEATURE_DATA_CROSS_NODE +{ + D3D12_CROSS_NODE_SHARING_TIER SharingTier; + BOOL AtomicShaderInstructions; +} D3D12_FEATURE_DATA_CROSS_NODE; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1747,6 +1753,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_EXISTING_HEAPS = 22, D3D12_FEATURE_D3D12_OPTIONS4 = 23, D3D12_FEATURE_SERIALIZATION = 24, + D3D12_FEATURE_CROSS_NODE = 25, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 370d51c..1612bb6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2931,6 +2931,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_CROSS_NODE: + { + D3D12_FEATURE_DATA_CROSS_NODE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->SharingTier = device->feature_options.CrossNodeSharingTier; + data->AtomicShaderInstructions = FALSE; + + TRACE("Cross node sharing tier %#x.\n", data->SharingTier); + TRACE("Cross node shader atomics %#x.\n", data->AtomicShaderInstructions); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_SERIALIZATION.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: 0a6415d6773bb50d96816c8d652181f061bf8c88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0a6415d6773bb50d96816c8… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:09 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_SERIALIZATION. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 13 +++++++++++++ libs/vkd3d/device.c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e7e05fe..c258b8f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -226,6 +226,12 @@ typedef enum D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_1 = 0x1, } D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER; +typedef enum D3D12_HEAP_SERIALIZATION_TIER +{ + D3D12_HEAP_SERIALIZATION_TIER_0 = 0x0, + D3D12_HEAP_SERIALIZATION_TIER_10 = 0xa, +} D3D12_HEAP_SERIALIZATION_TIER; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1715,6 +1721,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS4 BOOL Native16BitShaderOpsSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS4; +typedef struct D3D12_FEATURE_DATA_SERIALIZATION +{ + UINT NodeIndex; + D3D12_HEAP_SERIALIZATION_TIER HeapSerializationTier; +} D3D12_FEATURE_DATA_SERIALIZATION; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1734,6 +1746,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS3 = 21, D3D12_FEATURE_EXISTING_HEAPS = 22, D3D12_FEATURE_D3D12_OPTIONS4 = 23, + D3D12_FEATURE_SERIALIZATION = 24, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 878ca74..370d51c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2909,6 +2909,28 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_SERIALIZATION: + { + D3D12_FEATURE_DATA_SERIALIZATION *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + data->HeapSerializationTier = D3D12_HEAP_SERIALIZATION_TIER_0; + + TRACE("Heap serialisation tier %#x.\n", data->HeapSerializationTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS5.
by Alexandre Julliard 25 May '20

25 May '20

Module: vkd3d Branch: master Commit: 7d47f2323ecced1773ff7a4c927c3637cd73ea15 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7d47f2323ecced1773ff7a4… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Mon May 25 20:25:11 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS5. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 21 +++++++++++++++++++++ libs/vkd3d/device.c | 22 ++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 44 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index f27084f..48b87f0 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -232,6 +232,19 @@ typedef enum D3D12_HEAP_SERIALIZATION_TIER D3D12_HEAP_SERIALIZATION_TIER_10 = 0xa, } D3D12_HEAP_SERIALIZATION_TIER; +typedef enum D3D12_RENDER_PASS_TIER +{ + D3D12_RENDER_PASS_TIER_0 = 0x0, + D3D12_RENDER_PASS_TIER_1 = 0x1, + D3D12_RENDER_PASS_TIER_2 = 0x2, +} D3D12_RENDER_PASS_TIER; + +typedef enum D3D12_RAYTRACING_TIER +{ + D3D12_RAYTRACING_TIER_NOT_SUPPORTED = 0x0, + D3D12_RAYTRACING_TIER_1_0 = 0xa, +} D3D12_RAYTRACING_TIER; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1733,6 +1746,13 @@ typedef struct D3D12_FEATURE_DATA_CROSS_NODE BOOL AtomicShaderInstructions; } D3D12_FEATURE_DATA_CROSS_NODE; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS5 +{ + BOOL SRVOnlyTiledResourceTier3; + D3D12_RENDER_PASS_TIER RenderPassesTier; + D3D12_RAYTRACING_TIER RaytracingTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS5; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1754,6 +1774,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS4 = 23, D3D12_FEATURE_SERIALIZATION = 24, D3D12_FEATURE_CROSS_NODE = 25, + D3D12_FEATURE_D3D12_OPTIONS5 = 27, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1612bb6..843f327 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1362,6 +1362,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, * VK_KHR_shader_float16_int8. */ device->feature_options4.Native16BitShaderOpsSupported = FALSE; + device->feature_options5.SRVOnlyTiledResourceTier3 = FALSE; + device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; + device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -2949,6 +2953,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS5: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS5 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options5; + + TRACE("SRV tiled resource tier 3 only %#x.\n", data->SRVOnlyTiledResourceTier3); + TRACE("Render pass tier %#x.\n", data->RenderPassesTier); + TRACE("Ray tracing tier %#x.\n", data->RaytracingTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index da3e3fe..1cc7864 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1135,6 +1135,7 @@ struct d3d12_device D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4; + D3D12_FEATURE_DATA_D3D12_OPTIONS5 feature_options5; struct vkd3d_vulkan_info vk_info;

1 0