- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_increment().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

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: Use PRIuPTR for SIZE_T variables in debug traces.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

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

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_decrement().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

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

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS9 in CheckFeatureSupport().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

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

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS7 in CheckFeatureSupport().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: 5fd3076c67813be7be2d2e1805174f359e286cd9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5fd3076c67813be7be2d2e1805174… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 16:53:56 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS7 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2a7024ec..299ecd6d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3373,6 +3373,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS7: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS7 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->MeshShaderTier = D3D12_MESH_SHADER_TIER_NOT_SUPPORTED; + data->SamplerFeedbackTier = D3D12_SAMPLER_FEEDBACK_TIER_NOT_SUPPORTED; + + TRACE("Mesh shading tier %#x.\n", data->MeshShaderTier); + TRACE("Sampler feedback tier %#x.\n", data->SamplerFeedbackTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS8 in CheckFeatureSupport().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: 8ea67b0ac61b0122826ff9f61b34fc20b3ead7ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ea67b0ac61b0122826ff9f61b34f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 17:09:59 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS8 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 299ecd6d..b1c07eb2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3391,6 +3391,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS8: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS8 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->UnalignedBlockTexturesSupported = FALSE; + + TRACE("Unaligned block texture support %#x.\n", data->UnalignedBlockTexturesSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle hyperbolic trigonometric functions in sm6_parser_emit_dx_unary().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: 625e28957479971fc41fef16a65b3736e4492b07 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/625e28957479971fc41fef16a65b3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:28:44 2024 +1000 vkd3d-shader/dxil: Handle hyperbolic trigonometric functions in sm6_parser_emit_dx_unary(). --- libs/vkd3d-shader/d3d_asm.c | 3 +++ libs/vkd3d-shader/dxil.c | 12 ++++++++++++ libs/vkd3d-shader/spirv.c | 6 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ tests/hlsl/trigonometry.shader_test | 12 ++++++------ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 3ae736a8..3f86bd45 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -171,10 +171,13 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_GATHER4_S ] = "gather4_s", [VKD3DSIH_GEO ] = "ge", [VKD3DSIH_GEU ] = "ge_unord", + [VKD3DSIH_HCOS ] = "hcos", [VKD3DSIH_HS_CONTROL_POINT_PHASE ] = "hs_control_point_phase", [VKD3DSIH_HS_DECLS ] = "hs_decls", [VKD3DSIH_HS_FORK_PHASE ] = "hs_fork_phase", [VKD3DSIH_HS_JOIN_PHASE ] = "hs_join_phase", + [VKD3DSIH_HSIN ] = "hsin", + [VKD3DSIH_HTAN ] = "htan", [VKD3DSIH_IADD ] = "iadd", [VKD3DSIH_IBFE ] = "ibfe", [VKD3DSIH_IDIV ] = "idiv", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 89d972ca..a001f6f0 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -342,6 +342,9 @@ enum dx_intrinsic_opcode DX_ACOS = 15, DX_ASIN = 16, DX_ATAN = 17, + DX_HCOS = 18, + DX_HSIN = 19, + DX_HTAN = 20, DX_EXP = 21, DX_FRC = 22, DX_LOG = 23, @@ -3690,6 +3693,12 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_ASIN; case DX_ATAN: return VKD3DSIH_ATAN; + case DX_HCOS: + return VKD3DSIH_HCOS; + case DX_HSIN: + return VKD3DSIH_HSIN; + case DX_HTAN: + return VKD3DSIH_HTAN; case DX_EXP: return VKD3DSIH_EXP; case DX_FRC: @@ -4263,6 +4272,9 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_FMIN ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FRC ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_IBFE ] = {"m", "iiR", sm6_parser_emit_dx_tertiary}, + [DX_HCOS ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_HSIN ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_HTAN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_IMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_IMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_ISFINITE ] = {"1", "g", sm6_parser_emit_dx_unary}, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5f7a33da..a3baeea7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7008,6 +7008,9 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( {VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb}, {VKD3DSIH_FIRSTBIT_SHI, GLSLstd450FindSMsb}, {VKD3DSIH_FRC, GLSLstd450Fract}, + {VKD3DSIH_HCOS, GLSLstd450Cosh}, + {VKD3DSIH_HSIN, GLSLstd450Sinh}, + {VKD3DSIH_HTAN, GLSLstd450Tanh}, {VKD3DSIH_IMAX, GLSLstd450SMax}, {VKD3DSIH_IMIN, GLSLstd450SMin}, {VKD3DSIH_LOG, GLSLstd450Log2}, @@ -9587,6 +9590,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_ACOS: case VKD3DSIH_ASIN: case VKD3DSIH_ATAN: + case VKD3DSIH_HCOS: + case VKD3DSIH_HSIN: + case VKD3DSIH_HTAN: case VKD3DSIH_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3d043c24..1030adf9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -366,10 +366,13 @@ enum vkd3d_shader_opcode VKD3DSIH_GATHER4_S, VKD3DSIH_GEO, VKD3DSIH_GEU, + VKD3DSIH_HCOS, VKD3DSIH_HS_CONTROL_POINT_PHASE, VKD3DSIH_HS_DECLS, VKD3DSIH_HS_FORK_PHASE, VKD3DSIH_HS_JOIN_PHASE, + VKD3DSIH_HSIN, + VKD3DSIH_HTAN, VKD3DSIH_IADD, VKD3DSIH_IBFE, VKD3DSIH_IDIV, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index c9102e0a..034f861b 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -86,10 +86,10 @@ float4 main() : sv_target [test] uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 -todo draw quad +todo(sm<6) 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 +todo(sm<6) 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 @@ -104,10 +104,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 -todo draw quad +todo(sm<6) 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 +todo(sm<6) draw quad probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 @@ -121,8 +121,8 @@ float4 main() : sv_target [test] uniform 0 float4 -1.57079633 -0.54930614 0.54930614 1.57079633 -todo draw quad +todo(sm<6) 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 +todo(sm<6) draw quad probe all rgba (-1.0, 0.0, 0.0, 1.0) 1

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS6 in CheckFeatureSupport().
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: db4a98c0d27eee24857d2f1a3b7fd45e77a8a0bc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/db4a98c0d27eee24857d2f1a3b7fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 30 15:44:05 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS6 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cf8b506f..2a7024ec 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3348,6 +3348,31 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS6: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS6 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->AdditionalShadingRatesSupported = FALSE; + data->PerPrimitiveShadingRateSupportedWithViewportIndexing = FALSE; + data->VariableShadingRateTier = D3D12_VARIABLE_SHADING_RATE_TIER_NOT_SUPPORTED; + data->ShadingRateImageTileSize = 0; + data->BackgroundProcessingSupported = FALSE; + + TRACE("Additional shading rates support %#x.\n", data->AdditionalShadingRatesSupported); + TRACE("Per-primitive shading rates with viewport indexing %#x.\n", + data->PerPrimitiveShadingRateSupportedWithViewportIndexing); + TRACE("Variable shading rate tier %#x.\n", data->VariableShadingRateTier); + TRACE("Shading rate image tile size %#x.\n", data->ShadingRateImageTileSize); + TRACE("Background processing support %#x.\n", data->BackgroundProcessingSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Giovanni Mascellani : tests: Work around a Metal bug.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

Module: vkd3d Branch: master Commit: 4ba324d37c8fa7ca47525f2525ded391a0b851cc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4ba324d37c8fa7ca47525f2525ded… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 2 11:17:36 2024 +0100 tests: Work around a Metal bug. This test currently hit a Metal bug when run on Apple Silicon with MoltenVK and fails. We don't have an easy way to mark shader runner tests as buggy and we're not interested in tracking that bug anyway, so I'm just working around it. --- tests/hlsl/switch.shader_test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index 543d44e2..63c9c09d 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -527,7 +527,7 @@ float4 main() : sv_target { switch (v.x) { - case 0: + case 1: for (j = 0; j < v.z; j++) { c += 1.0f; @@ -535,7 +535,7 @@ float4 main() : sv_target continue; } break; - case 1: + case 0: c += 2.0f; break; } @@ -545,10 +545,10 @@ float4 main() : sv_target } [test] -uniform 0 uint4 0 0 3 1 +uniform 0 uint4 1 0 3 1 draw quad probe all rgba (10.0, 11.0, 12.0, 13.0) -uniform 0 uint4 1 0 3 1 +uniform 0 uint4 0 0 3 1 draw quad probe all rgba (7.0, 8.0, 9.0, 10.0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic TextureStore.
by Alexandre Julliard Feb. 7, 2024

Feb. 7, 2024

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