February 2024 - Wine-commits

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS9 in CheckFeatureSupport().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 18f73c1c4d9dbd4de9549c4eee1487b51146ced6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18f73c1c4d9dbd4de9549c4eee148… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 6 12:17:02 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS9 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1c07eb2..7cdc5d77 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3407,6 +3407,32 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS9: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS9 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->MeshShaderPipelineStatsSupported = FALSE; + data->MeshShaderSupportsFullRangeRenderTargetArrayIndex = FALSE; + data->AtomicInt64OnTypedResourceSupported = FALSE; + data->AtomicInt64OnGroupSharedSupported = FALSE; + data->DerivativesInMeshAndAmplificationShadersSupported = FALSE; + data->WaveMMATier = D3D12_WAVE_MMA_TIER_NOT_SUPPORTED; + + TRACE("Mesh shader pipeline stats support %#x.\n", data->MeshShaderPipelineStatsSupported); + TRACE("Mesh shader RT array index full range %#x.\n", data->MeshShaderSupportsFullRangeRenderTargetArrayIndex); + TRACE("Atomic int64 on typed resource %#x.\n", data->AtomicInt64OnTypedResourceSupported); + TRACE("Atomic int64 on group shared mem %#x.\n", data->AtomicInt64OnGroupSharedSupported); + TRACE("Derivatives in mesh and amp shaders %#x.\n", data->DerivativesInMeshAndAmplificationShadersSupported); + TRACE("Wave MMA tier %#x.\n", data->WaveMMATier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_increment().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 6e439045e8f1de337c1dc2cfbe0da3875b11973d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e439045e8f1de337c1dc2cfbe0da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 13:17:29 2024 +0100 vkd3d: Get rid of vkd3d_atomic_increment(). --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 14 -------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 609300d3..132ab228 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1921,7 +1921,7 @@ HRESULT d3d12_command_allocator_create(struct d3d12_device *device, static void d3d12_command_signature_incref(struct d3d12_command_signature *signature) { - vkd3d_atomic_increment(&signature->internal_refcount); + vkd3d_atomic_increment_u32(&signature->internal_refcount); } static void d3d12_command_signature_decref(struct d3d12_command_signature *signature) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c04f4870..2368473a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2314,7 +2314,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) STATIC_ASSERT(!(ARRAY_SIZE(cache->heads) & HEAD_INDEX_MASK)); - i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) @@ -2345,7 +2345,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, /* Using the same index as above may result in a somewhat uneven distribution, * but the main objective is to avoid costly spinlock contention. */ - i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) @@ -2357,7 +2357,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, u.header->next = head; cache->heads[i].head = u.object; vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); - vkd3d_atomic_increment(&cache->free_count); + vkd3d_atomic_increment_u32(&cache->free_count); } #undef HEAD_INDEX_MASK diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5955e616..eb65397a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,11 +257,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) { } -static inline unsigned int vkd3d_atomic_increment(unsigned int volatile *x) -{ - return InterlockedIncrement((LONG volatile *)x); -} - static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) { return InterlockedDecrement((LONG volatile *)x); @@ -398,15 +393,6 @@ static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) # error "vkd3d_atomic_decrement() not implemented for this platform" # endif /* HAVE_SYNC_SUB_AND_FETCH */ -# if HAVE_SYNC_ADD_AND_FETCH -static inline unsigned int vkd3d_atomic_increment(unsigned int volatile *x) -{ - return __sync_add_and_fetch(x, 1); -} -# else -# error "vkd3d_atomic_increment() not implemented for this platform" -# endif /* HAVE_SYNC_ADD_AND_FETCH */ - # if HAVE_SYNC_BOOL_COMPARE_AND_SWAP static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) {

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_decrement().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 8ddca1ebaf376716baff259c4c7052a73404436d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ddca1ebaf376716baff259c4c705… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 13:21:09 2024 +0100 vkd3d: Get rid of vkd3d_atomic_decrement(). --- configure.ac | 1 - libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 14 -------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 0b84b1ab..4cb229d5 100644 --- a/configure.ac +++ b/configure.ac @@ -154,7 +154,6 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) -VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_BOOL_COMPARE_AND_SWAP], [__sync_bool_compare_and_swap], [__sync_bool_compare_and_swap((int *)0, 0, 0)]) VKD3D_CHECK_FUNC([HAVE_ATOMIC_EXCHANGE_N], [__atomic_exchange_n], [__atomic_exchange_n((int *)0, 0, 0)]) AC_CHECK_FUNCS([gettid]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 132ab228..9a3e44c6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1926,7 +1926,7 @@ static void d3d12_command_signature_incref(struct d3d12_command_signature *signa static void d3d12_command_signature_decref(struct d3d12_command_signature *signature) { - unsigned int refcount = vkd3d_atomic_decrement(&signature->internal_refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&signature->internal_refcount); if (!refcount) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 2368473a..8f4d1835 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2321,7 +2321,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) { if ((u.object = cache->heads[i].head)) { - vkd3d_atomic_decrement(&cache->free_count); + vkd3d_atomic_decrement_u32(&cache->free_count); cache->heads[i].head = u.header->next; vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); return u.object; @@ -2429,7 +2429,7 @@ void vkd3d_view_decref(void *view, struct d3d12_device *device) { union d3d12_desc_object u = {view}; - if (vkd3d_atomic_decrement(&u.header->refcount)) + if (vkd3d_atomic_decrement_u32(&u.header->refcount)) return; if (u.header->magic != VKD3D_DESCRIPTOR_MAGIC_CBV) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eb65397a..a74c49ea 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,11 +257,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) { } -static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) -{ - return InterlockedDecrement((LONG volatile *)x); -} - static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) { return InterlockedCompareExchange((LONG volatile *)x, xchg, cmp) == cmp; @@ -384,15 +379,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) ERR("Could not destroy the condition variable, error %d.\n", ret); } -# if HAVE_SYNC_SUB_AND_FETCH -static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) -{ - return __sync_sub_and_fetch(x, 1); -} -# else -# error "vkd3d_atomic_decrement() not implemented for this platform" -# endif /* HAVE_SYNC_SUB_AND_FETCH */ - # if HAVE_SYNC_BOOL_COMPARE_AND_SWAP static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) {

1 0

Henri Verbeet : vkd3d: Use PRIuPTR for SIZE_T variables in debug traces.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 5c917552c927835c6f446dbecf1aa6ff2cc30cbe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c917552c927835c6f446dbecf1aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:54:47 2024 +0100 vkd3d: Use PRIuPTR for SIZE_T variables in debug traces. --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/device.c | 11 ++++++----- libs/vkd3d/vkd3d_main.c | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9a3e44c6..8a47dc49 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5963,15 +5963,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndRenderPass(ID3D12GraphicsCom static void STDMETHODCALLTYPE d3d12_command_list_InitializeMetaCommand(ID3D12GraphicsCommandList5 *iface, ID3D12MetaCommand *meta_command, const void *parameters_data, SIZE_T data_size_in_bytes) { - FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %lu stub!\n", iface, - meta_command, parameters_data, data_size_in_bytes); + FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %"PRIuPTR" stub!\n", iface, + meta_command, parameters_data, (uintptr_t)data_size_in_bytes); } static void STDMETHODCALLTYPE d3d12_command_list_ExecuteMetaCommand(ID3D12GraphicsCommandList5 *iface, ID3D12MetaCommand *meta_command, const void *parameters_data, SIZE_T data_size_in_bytes) { - FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %lu stub!\n", iface, - meta_command, parameters_data, data_size_in_bytes); + FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %"PRIuPTR" stub!\n", iface, + meta_command, parameters_data, (uintptr_t)data_size_in_bytes); } static void STDMETHODCALLTYPE d3d12_command_list_BuildRaytracingAccelerationStructure(ID3D12GraphicsCommandList5 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7cdc5d77..90272818 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3487,8 +3487,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device7 struct d3d12_root_signature *object; HRESULT hr; - TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n", - iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature); + TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %"PRIuPTR", riid %s, root_signature %p.\n", + iface, node_mask, bytecode, (uintptr_t)bytecode_length, debugstr_guid(riid), root_signature); debug_ignored_node_mask(node_mask); @@ -4125,7 +4125,8 @@ static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device7 *iface static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineLibrary(ID3D12Device7 *iface, const void *blob, SIZE_T blob_size, REFIID iid, void **lib) { - FIXME("iface %p, blob %p, blob_size %lu, iid %s, lib %p stub!\n", iface, blob, blob_size, debugstr_guid(iid), lib); + FIXME("iface %p, blob %p, blob_size %"PRIuPTR", iid %s, lib %p stub!\n", + iface, blob, (uintptr_t)blob_size, debugstr_guid(iid), lib); return DXGI_ERROR_UNSUPPORTED; } @@ -4322,9 +4323,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateMetaCommand(ID3D12Device7 *i SIZE_T data_size_in_bytes, REFIID iid, void **meta_command) { FIXME("iface %p, command_id %s, node_mask %#x, parameters_data %p, " - "data_size_in_bytes %lu, iid %s, meta_command %p stub!\n", iface, + "data_size_in_bytes %"PRIuPTR", iid %s, meta_command %p stub!\n", iface, debugstr_guid(command_id), node_mask, parameters_data, - data_size_in_bytes, debugstr_guid(iid), meta_command); + (uintptr_t)data_size_in_bytes, debugstr_guid(iid), meta_command); return E_NOTIMPL; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index f71b3701..7919b7d8 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -222,8 +222,8 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s struct d3d12_root_signature_deserializer *object; HRESULT hr; - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", - data, data_size, debugstr_guid(iid), deserializer); + TRACE("data %p, data_size %"PRIuPTR", iid %s, deserializer %p.\n", + data, (uintptr_t)data_size, debugstr_guid(iid), deserializer); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; @@ -406,8 +406,8 @@ HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZ struct vkd3d_shader_code dxbc = {data, data_size}; HRESULT hr; - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", - data, data_size, debugstr_guid(iid), deserializer); + TRACE("data %p, data_size %"PRIuPTR", iid %s, deserializer %p.\n", + data, (uintptr_t)data_size, debugstr_guid(iid), deserializer); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Conor McCarthy : tests/shader-runner: Emit descriptor ranges for consecutive resources.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 805a4bc1e8dbce695b0b59950aef8cb4443303ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/805a4bc1e8dbce695b0b59950aef8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 30 12:01:57 2024 +1000 tests/shader-runner: Emit descriptor ranges for consecutive resources. Shader models >= 5.1 support descriptor indexing, and emit arrayed resource declarations. --- tests/hlsl/object-references.shader_test | 2 +- .../register-reservations-resources.shader_test | 2 +- tests/shader_runner_d3d12.c | 33 ++++++++++++++++------ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test index 5c807094..698df011 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -111,7 +111,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (312, 312, 312, 111) diff --git a/tests/hlsl/register-reservations-resources.shader_test b/tests/hlsl/register-reservations-resources.shader_test index 22a44102..1fa1e916 100644 --- a/tests/hlsl/register-reservations-resources.shader_test +++ b/tests/hlsl/register-reservations-resources.shader_test @@ -34,7 +34,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (41.0, 41.0, 41.0, 1089.0) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c6154cd1..16cfec1b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -241,7 +241,9 @@ static ID3D12RootSignature *d3d12_runner_create_root_signature(struct d3d12_shad D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; D3D12_ROOT_PARAMETER root_params[17], *root_param; D3D12_STATIC_SAMPLER_DESC static_samplers[7]; + struct d3d12_resource *base_resource = NULL; ID3D12RootSignature *root_signature; + unsigned int slot; HRESULT hr; size_t i; @@ -274,6 +276,14 @@ static ID3D12RootSignature *d3d12_runner_create_root_signature(struct d3d12_shad case RESOURCE_TYPE_BUFFER_UAV: range = &resource->descriptor_range; + if (base_resource && resource->r.type == base_resource->r.type && resource->r.slot == slot + 1) + { + ++base_resource->descriptor_range.NumDescriptors; + resource->descriptor_range.NumDescriptors = 0; + ++slot; + continue; + } + resource->root_index = root_signature_desc.NumParameters++; root_param = &root_params[resource->root_index]; root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; @@ -289,6 +299,9 @@ static ID3D12RootSignature *d3d12_runner_create_root_signature(struct d3d12_shad range->BaseShaderRegister = resource->r.slot; range->RegisterSpace = 0; range->OffsetInDescriptorsFromTableStart = 0; + + base_resource = resource; + slot = resource->r.slot; break; case RESOURCE_TYPE_RENDER_TARGET: @@ -376,14 +389,16 @@ static bool d3d12_runner_dispatch(struct shader_runner *r, unsigned int x, unsig switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, resource->root_index, - get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); + if (resource->descriptor_range.NumDescriptors) + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; case RESOURCE_TYPE_UAV: case RESOURCE_TYPE_BUFFER_UAV: - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, resource->root_index, - get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + if (resource->descriptor_range.NumDescriptors) + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); break; case RESOURCE_TYPE_RENDER_TARGET: @@ -517,14 +532,16 @@ static bool d3d12_runner_draw(struct shader_runner *r, break; case RESOURCE_TYPE_TEXTURE: - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, - get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); + if (resource->descriptor_range.NumDescriptors) + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; case RESOURCE_TYPE_UAV: case RESOURCE_TYPE_BUFFER_UAV: - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, - get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + if (resource->descriptor_range.NumDescriptors) + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); break; case RESOURCE_TYPE_VERTEX_BUFFER:

1 0

Conor McCarthy : tests/shader-runner: Add shader model 6 texture UAV tests.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: cf4ed988d0fddd2031d95a4341a8db57243d8a54 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf4ed988d0fddd2031d95a4341a8d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 29 14:46:50 2024 +1000 tests/shader-runner: Add shader model 6 texture UAV tests. The UAV default register allocation rules changed with SM 5.1. --- Makefile.am | 1 + tests/hlsl/sm6-uav-rwtexture.shader_test | 208 +++++++++++++++++++++++++++++++ tests/hlsl/uav-rwtexture.shader_test | 31 +++-- 3 files changed, 227 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1687d9a0..d9db8eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,6 +170,7 @@ vkd3d_shader_tests = \ tests/hlsl/sign.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \ tests/hlsl/sm6-ternary.shader_test \ + tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/smoothstep.shader_test \ tests/hlsl/sqrt.shader_test \ tests/hlsl/state-block-syntax.shader_test \ diff --git a/tests/hlsl/sm6-uav-rwtexture.shader_test b/tests/hlsl/sm6-uav-rwtexture.shader_test new file mode 100644 index 00000000..78fbb385 --- /dev/null +++ b/tests/hlsl/sm6-uav-rwtexture.shader_test @@ -0,0 +1,208 @@ +[require] +shader model >= 6.0 + +[uav 0] +format r32 float +size (2, 2) + +0.1 0.2 +0.3 0.4 + +[uav 1] +size (1, 1) + +0.5 0.6 0.7 0.8 + +[pixel shader] +RWTexture2D<float4> u : register(u1); + +float4 main() : sv_target +{ + /* Unlike SM < 6.0, all four components are not required to be written in a single statement. */ + u[uint2(0, 0)].xy = float2(1, 2); + u[uint2(0, 0)].zw = float2(3, 4); + return 0; +} + +[test] +todo draw quad +probe uav 1 (0, 0) rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail] +Texture2D<float4> u; + +float4 main() : sv_target +{ + /* SRVs are not writable. */ + u[uint2(0, 0)].xyzw = float4(1, 2, 3, 4); + return 0; +} + +[pixel shader] +RWTexture2D<float> u; +RWTexture2D<float4> v; + +float4 main() : sv_target +{ + u[uint2(0, 0)] = 0.5; + u[uint2(0, 1)].x = 0.6; + u[uint2(1, 1)] = 0.7; + v[uint2(0, 0)].yxwz = float4(1, 2, 3, 4); + return 0; +} + +[test] +todo draw quad +probe uav 0 (0, 0) r (0.5) +probe uav 0 (0, 1) r (0.6) +probe uav 0 (1, 0) r (0.2) +probe uav 0 (1, 1) r (0.7) +probe uav 1 (0, 0) rgba (2.0, 1.0, 4.0, 3.0) + + +[uav 2] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[pixel shader] +RWTexture2D<float4> u : register(u2); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[test] +todo draw quad +probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) + +% Uppercase register set name +[pixel shader] +RWTexture2D<float4> u : register(U2); + +float4 main() : sv_target1 +{ + u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6); + return 0; +} + +[test] +todo draw quad +probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) + +% Test that we can declare and use an array of UAVs. + +[uav 1] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[uav 2] +size (1, 1) + +0.5 0.6 0.7 0.8 + +[pixel shader] +RWTexture2D<float4> u[2] : register(u1); + +float4 main() : sv_target1 +{ + u[0][uint2(0, 0)] = float4(1.1, 1.2, 1.3, 1.4); + u[1][uint2(0, 0)] = float4(2.1, 2.2, 2.3, 2.4); + return 0; +} + +[test] +todo draw quad +probe uav 1 (0, 0) rgba (1.1, 1.2, 1.3, 1.4) +probe uav 2 (0, 0) rgba (2.1, 2.2, 2.3, 2.4) + +% RWTexture1D types +[pixel shader] + +RWTexture1D<float4> u : register(u1); +RWTexture1D<float> u0; + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture1DArray types +[pixel shader] + +RWTexture1DArray<float4> u : register(u1); +RWTexture1DArray<float> u0; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture2D types +[pixel shader] + +RWTexture2D<float4> u : register(u1); +RWTexture2D<float> u0; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture2DArray types +[pixel shader] + +RWTexture2DArray<float4> u : register(u1); +RWTexture2DArray<float> u0; + +float4 main() : sv_target1 +{ + u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% RWTexture3D types +[pixel shader] + +RWTexture3D<float4> u : register(u1); +RWTexture3D<float> u0; + +float4 main() : sv_target1 +{ + u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% Structs are invalid in SM 6. +[pixel shader fail] +struct s +{ + float4 a; +}; + +RWTexture2D<float4> u : register(u1); +RWTexture2D<struct s> u0; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +% Matrices are invalid in SM 6. +[pixel shader fail] + +RWTexture2D<float4> u : register(u1); +RWTexture2D<float2x2> u0; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index 76535bd5..5cfd969f 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -1,7 +1,8 @@ [require] shader model >= 5.0 +shader model < 6.0 -[pixel shader fail(sm<6)] +[pixel shader fail] RWTexture2D<float4> u; float4 main() : sv_target @@ -49,7 +50,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe uav 1 (0, 0) r (0.5) probe uav 1 (0, 1) r (0.6) probe uav 1 (1, 0) r (0.2) @@ -71,7 +72,7 @@ size (1, 1) 0.1 0.2 0.3 0.4 -[pixel shader fail(sm<6)] +[pixel shader fail] RWTexture2D<float4> u : register(u0); float4 main() : sv_target1 @@ -80,7 +81,7 @@ float4 main() : sv_target1 return 0; } -[pixel shader fail(sm<6)] +[pixel shader fail] RWTexture2D<float4> u : register(u1); float4 main() : sv_target1 @@ -99,7 +100,7 @@ float4 main() : sv_target1 } [test] -todo(sm>=6) draw quad +draw quad probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) @@ -118,7 +119,7 @@ float4 main() : sv_target1 } [test] -todo(sm>=6) draw quad +draw quad probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) % Uppercase register set name @@ -132,7 +133,7 @@ float4 main() : sv_target1 } [test] -todo(sm>=6) draw quad +draw quad probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) % Test that we can declare and use an array of UAVs. @@ -158,12 +159,12 @@ float4 main() : sv_target1 } [test] -todo(sm>=6) draw quad +draw quad probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4) probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4) % RWTexture1D types -[pixel shader fail(sm>=6)] +[pixel shader] struct s { float3 a; @@ -181,7 +182,7 @@ float4 main() : sv_target1 } % RWTexture1DArray types -[pixel shader fail(sm>=6)] +[pixel shader] struct s { float3 a; @@ -199,7 +200,7 @@ float4 main() : sv_target1 } % RWTexture2D types -[pixel shader fail(sm>=6)] +[pixel shader] struct s { float3 a; @@ -217,7 +218,7 @@ float4 main() : sv_target1 } % RWTexture2DArray types -[pixel shader fail(sm>=6)] +[pixel shader] struct s { float3 a; @@ -235,7 +236,7 @@ float4 main() : sv_target1 } % RWTexture3D types -[pixel shader fail(sm>=6)] +[pixel shader] struct s { float3 a; @@ -252,6 +253,10 @@ float4 main() : sv_target1 return 0; } + +[require] +shader model >= 5.0 + % Type is too wide [pixel shader fail] struct s

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic TextureStore.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: c35ec4f820a333897537a098d77bc66fe0c6bd3e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c35ec4f820a333897537a098d77bc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 29 14:52:59 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic TextureStore. --- libs/vkd3d-shader/dxil.c | 124 +++++++++++++++++++++++++------ tests/hlsl/compute.shader_test | 2 +- tests/hlsl/sm6-uav-rwtexture.shader_test | 10 +-- tests/hlsl/uav-load.shader_test | 2 +- tests/hlsl/uav-out-param.shader_test | 4 +- 5 files changed, 112 insertions(+), 30 deletions(-)

1 0

Conor McCarthy : tests/shader-runner: Add hyperbolic trigonometry tests.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: c2f6985454ce1252a12395da85e236b313f6c062 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2f6985454ce1252a12395da85e23… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 17:37:41 2024 +1000 tests/shader-runner: Add hyperbolic trigonometry tests. --- tests/hlsl/trigonometry.shader_test | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 90eac333..c9102e0a 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -74,3 +74,55 @@ float4 main() : sv_target uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 todo(sm<4) draw quad probe all rgba (0, 1000, -1000.0, 0) + + +[pixel shader todo] +uniform float4 a; + +float4 main() : sv_target +{ + return sinh(a); +} + +[test] +uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 +todo draw quad +probe all rgba (-267.744894, -1.0, 1.0, 267.744894) 2 +uniform 0 float4 -0.0 0.0 -90.0 90.0 +todo draw quad +% mingw does not support "inf" for scanf(), but numbers beyond FLOAT_MAX consistently result in inf. +probe all rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 + + +[pixel shader todo] +uniform float4 a; + +float4 main() : sv_target +{ + return cosh(a); +} + +[test] +uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 +todo draw quad +probe all rgba (3.0, 2.0, 2.0, 3.0) 2 +uniform 0 float4 -0.0 0.0 -90.0 90.0 +todo draw quad +probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 + + +[pixel shader todo] +uniform float4 a; + +float4 main() : sv_target +{ + return tanh(a); +} + +[test] +uniform 0 float4 -1.57079633 -0.54930614 0.54930614 1.57079633 +todo draw quad +probe all rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2 +uniform 0 float4 -10.0 -0.0 0.0 10.0 +todo draw quad +probe all rgba (-1.0, 0.0, 0.0, 1.0) 1

1 0

Esme Povirk : user32/tests: Fix flags on expected EM_GETPASSWORDCHAR message.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: wine Branch: master Commit: ce4636e510750de64a99f0a2443a51b1dc3f8b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce4636e510750de64a99f0a2443a51… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Feb 7 20:50:34 2024 +0000 user32/tests: Fix flags on expected EM_GETPASSWORDCHAR message. I missed that a few of these had the defwinproc flag when initially adding them. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3414dda6e5a..b699aaa6ff9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13197,7 +13197,7 @@ static const struct message sl_edit_lbutton_down[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EM_GETPASSWORDCHAR, sent|optional }, /* Sent on some Win10 machines */ + { EM_GETPASSWORDCHAR, sent|defwinproc|optional }, /* Sent on some Win10 machines */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, @@ -13222,7 +13222,7 @@ static const struct message ml_edit_lbutton_down[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EM_GETPASSWORDCHAR, sent|optional }, /* Sent on some Win10 machines */ + { EM_GETPASSWORDCHAR, sent|defwinproc|optional }, /* Sent on some Win10 machines */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 },

1 0

Eric Pouech : dmime: Fully implement IDirectMusicSegmentState::GetRepeats().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: wine Branch: master Commit: ed92095f28808282c5338a5cb89ec758f7b3b4e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed92095f28808282c5338a5cb89ec7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:57:08 2024 +0100 dmime: Fully implement IDirectMusicSegmentState::GetRepeats(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segmentstate.c | 10 ++++++---- dlls/dmime/tests/dmime.c | 3 --- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 3b939bc95ca..38ff9185534 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -53,7 +53,7 @@ struct segment_state MUSIC_TIME end_point; MUSIC_TIME played; BOOL auto_download; - DWORD repeats; + DWORD repeats, actual_repeats; struct list tracks; }; @@ -117,7 +117,8 @@ static ULONG WINAPI segment_state_Release(IDirectMusicSegmentState8 *iface) static HRESULT WINAPI segment_state_GetRepeats(IDirectMusicSegmentState8 *iface, DWORD *repeats) { struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %p): semi-stub\n", This, repeats); + TRACE("(%p, %p)\n", This, repeats); + *repeats = This->repeats; return S_OK; } @@ -236,6 +237,7 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetLength(segment, &This->end_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetRepeats(segment, &This->repeats); + if (SUCCEEDED(hr)) This->actual_repeats = This->repeats; for (i = 0; SUCCEEDED(hr); i++) { @@ -315,7 +317,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { - if (!This->repeats) + if (!This->actual_repeats) { MUSIC_TIME end_time = This->start_time + This->played; @@ -332,7 +334,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic &This->end_point))) break; This->start_time += This->end_point - This->start_point; - This->repeats--; + This->actual_repeats--; if (next_time <= This->start_time || This->end_point <= This->start_point) break; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 26fdf3ef2a5..f6f34915547 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4540,7 +4540,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); @@ -4624,7 +4623,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); @@ -4655,7 +4653,6 @@ static void test_segment_state(void) value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time);

1 0