- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_deserializer_Release().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: afd0e45cd6634be3395ada4e21da1c07f9d466e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/afd0e45cd6634be3395ada4e21da1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:41:05 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_deserializer_Release(). --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index df38e1a1..e965cad4 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12Ro static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_deserializer_AddRef().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: c2e82cf06abf630ba139377f907b75df5cdbc9c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2e82cf06abf630ba139377f907b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:38:41 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_deserializer_AddRef(). --- libs/vkd3d/vkd3d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 29c74018..df38e1a1 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -82,7 +82,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, struct d3d12_root_signature_deserializer { ID3D12RootSignatureDeserializer ID3D12RootSignatureDeserializer_iface; - LONG refcount; + unsigned int refcount; union { @@ -123,7 +123,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_deserializer_QueryInterfac static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - ULONG refcount = InterlockedIncrement(&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&deserializer->refcount); TRACE("%p increasing refcount to %u.\n", deserializer, refcount); @@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12Ro static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - ULONG refcount = InterlockedDecrement(&deserializer->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_pipeline_state_AddRef().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: c71fa87522cff2a14ae18d76bb72d94b71e04b8c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c71fa87522cff2a14ae18d76bb72d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:19:52 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_pipeline_state_AddRef(). --- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4d8fdcb3..b818feb5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1984,7 +1984,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_QueryInterface(ID3D12Pipel static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_AddRef(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - ULONG refcount = InterlockedIncrement(&state->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&state->refcount); TRACE("%p increasing refcount to %u.\n", state, refcount); @@ -2027,7 +2027,7 @@ static void d3d12_pipeline_uav_counter_state_cleanup(struct d3d12_pipeline_uav_c static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - ULONG refcount = InterlockedDecrement(&state->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7567a7fc..d46f434d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1288,7 +1288,7 @@ struct d3d12_pipeline_uav_counter_state struct d3d12_pipeline_state { ID3D12PipelineState ID3D12PipelineState_iface; - LONG refcount; + unsigned int refcount; union {

1 0

Jacek Caban : vkd3d: Use uint64_t for the size in vkd3d_gpu_va_allocator_allocate.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 2ae9f18a3a450894afa6c5a537b4e97532eb9bdb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2ae9f18a3a450894afa6c5a537b4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 31 22:15:57 2024 +0100 vkd3d: Use uint64_t for the size in vkd3d_gpu_va_allocator_allocate. Avoids value truncation in 32-bit builds. --- include/private/vkd3d_common.h | 2 +- libs/vkd3d/device.c | 14 +++++++------- libs/vkd3d/vkd3d_private.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 46090eac..01e219b3 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -71,7 +71,7 @@ #define TAG_XNAP VKD3D_MAKE_TAG('X', 'N', 'A', 'P') #define TAG_XNAS VKD3D_MAKE_TAG('X', 'N', 'A', 'S') -static inline size_t align(size_t addr, size_t alignment) +static inline uint64_t align(uint64_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0b2e0ace..81386df9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2133,7 +2133,7 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) #define VKD3D_VA_SLAB_COUNT (64 * 1024) static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_slab(struct vkd3d_gpu_va_allocator *allocator, - size_t aligned_size, void *ptr) + uint64_t aligned_size, void *ptr) { struct vkd3d_gpu_va_slab *slab; D3D12_GPU_VIRTUAL_ADDRESS address; @@ -2149,13 +2149,13 @@ static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_slab(struct vkd slab_idx = slab - allocator->slabs; address = VKD3D_VA_SLAB_BASE + slab_idx * VKD3D_VA_SLAB_SIZE; - TRACE("Allocated address %#"PRIx64", slab %u, size %zu.\n", address, slab_idx, aligned_size); + TRACE("Allocated address %#"PRIx64", slab %u, size %"PRIu64".\n", address, slab_idx, aligned_size); return address; } static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_fallback(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t aligned_size, void *ptr) + size_t alignment, uint64_t aligned_size, void *ptr) { struct vkd3d_gpu_va_allocation *allocation; D3D12_GPU_VIRTUAL_ADDRESS base, ceiling; @@ -2181,17 +2181,17 @@ static D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate_fallback(struct * only fail once we have exhausted 63 bits of address space. */ allocator->fallback_floor = base + aligned_size; - TRACE("Allocated address %#"PRIx64", size %zu.\n", base, aligned_size); + TRACE("Allocated address %#"PRIx64", size %"PRIu64".\n", base, aligned_size); return base; } D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t size, void *ptr) + size_t alignment, uint64_t size, void *ptr) { D3D12_GPU_VIRTUAL_ADDRESS address; - if (size > ~(size_t)0 - (alignment - 1)) + if (size > ~(uint64_t)0 - (alignment - 1)) return 0; size = align(size, alignment); @@ -2227,7 +2227,7 @@ static void *vkd3d_gpu_va_allocator_dereference_slab(struct vkd3d_gpu_va_allocat base_offset -= slab_idx * VKD3D_VA_SLAB_SIZE; if (base_offset >= slab->size) { - ERR("Address %#"PRIx64" is %#"PRIx64" bytes into slab %u of size %zu.\n", + ERR("Address %#"PRIx64" is %#"PRIx64" bytes into slab %u of size %"PRIu64".\n", address, base_offset, slab_idx, slab->size); return NULL; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 27133c8e..81c7a513 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -493,13 +493,13 @@ struct vkd3d_fence_worker struct vkd3d_gpu_va_allocation { D3D12_GPU_VIRTUAL_ADDRESS base; - size_t size; + uint64_t size; void *ptr; }; struct vkd3d_gpu_va_slab { - size_t size; + uint64_t size; void *ptr; }; @@ -517,7 +517,7 @@ struct vkd3d_gpu_va_allocator }; D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t size, void *ptr); + size_t alignment, uint64_t size, void *ptr); void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_AddRef().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 37e8826301d6b0819bf7240c05568858df17e3a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/37e8826301d6b0819bf7240c05568… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:16:25 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_AddRef(). --- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5f383d25..a9eb7f73 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -52,7 +52,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_QueryInterface(ID3D12RootS static ULONG STDMETHODCALLTYPE d3d12_root_signature_AddRef(ID3D12RootSignature *iface) { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - ULONG refcount = InterlockedIncrement(&root_signature->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&root_signature->refcount); TRACE("%p increasing refcount to %u.\n", root_signature, refcount); @@ -110,7 +110,7 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature *iface) { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - ULONG refcount = InterlockedDecrement(&root_signature->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&root_signature->refcount); TRACE("%p decreasing refcount to %u.\n", root_signature, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 81c7a513..7567a7fc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1179,7 +1179,7 @@ struct d3d12_descriptor_set_layout struct d3d12_root_signature { ID3D12RootSignature ID3D12RootSignature_iface; - LONG refcount; + unsigned int refcount; VkPipelineLayout vk_pipeline_layout; struct d3d12_descriptor_set_layout descriptor_set_layouts[VKD3D_MAX_DESCRIPTOR_SETS];

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_Release().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 9e135f6143925294bd7426aa7b25f562279c53cb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9e135f6143925294bd7426aa7b25f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:18:05 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_Release(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a9eb7f73..4d8fdcb3 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -110,7 +110,7 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature *iface) { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&root_signature->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&root_signature->refcount); TRACE("%p decreasing refcount to %u.\n", root_signature, refcount);

1 0

Conor McCarthy : tests/d3d12: Test multiple descriptions in test_resource_allocation_info().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 8d0331df6c0d705956cc74e400240a7f86c88449 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d0331df6c0d705956cc74e400240… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 00:29:06 2024 +1000 tests/d3d12: Test multiple descriptions in test_resource_allocation_info(). --- tests/d3d12.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5172dd71..e9bda25c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32138,6 +32138,7 @@ static void test_resource_allocation_info(void) D3D12_RESOURCE_ALLOCATION_INFO info; D3D12_RESOURCE_DESC desc; ID3D12Device *device; + uint64_t total = 0; unsigned int i, j; ULONG refcount; @@ -32184,6 +32185,7 @@ static void test_resource_allocation_info(void) {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; + D3D12_RESOURCE_DESC desc_array[ARRAY_SIZE(texture_tests)]; if (!(device = create_device())) { @@ -32249,6 +32251,8 @@ static void test_resource_allocation_info(void) ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); check_alignment(info.SizeInBytes, info.Alignment); + if (i >= 6) + total += info.SizeInBytes; desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); @@ -32257,6 +32261,7 @@ static void test_resource_allocation_info(void) if (i < 6) { check_alignment(info.SizeInBytes, info.Alignment); + total += info.SizeInBytes; } else { @@ -32267,6 +32272,25 @@ static void test_resource_allocation_info(void) } } + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + desc_array[i] = desc; + desc_array[i].Width = texture_tests[i].width; + desc_array[i].Height = texture_tests[i].height; + desc_array[i].DepthOrArraySize = texture_tests[i].array_size; + desc_array[i].MipLevels = texture_tests[i].miplevels; + desc_array[i].Format = texture_tests[i].format; + desc_array[i].Alignment = (i < 6) ? D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + } + info = ID3D12Device_GetResourceAllocationInfo(device, 0, ARRAY_SIZE(desc_array), desc_array); + todo + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + todo + ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : vkd3d: Support multiple descriptions in GetResourceAllocationInfo().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 7e84421b9c0468b31fb76ec8459c4e7cb277e97d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e84421b9c0468b31fb76ec8459c4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 00:27:54 2024 +1000 vkd3d: Support multiple descriptions in GetResourceAllocationInfo(). --- libs/vkd3d/device.c | 118 +++++++++++++++++++++++++-------------------- libs/vkd3d/resource.c | 6 +-- libs/vkd3d/vkd3d_private.h | 9 +++- tests/d3d12.c | 2 - 4 files changed, 77 insertions(+), 58 deletions(-)

1 0

Conor McCarthy : tests/d3d12: Add tests for GetResourceAllocationInfo1().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 67b4ae658a12fb2690dd5f93a92113699e0fc69b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67b4ae658a12fb2690dd5f93a9211… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 11:37:43 2024 +1000 tests/d3d12: Add tests for GetResourceAllocationInfo1(). --- tests/d3d12.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f0dba3c7..58bd2129 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32137,6 +32137,7 @@ static void test_resource_allocation_info(void) { D3D12_RESOURCE_ALLOCATION_INFO info; D3D12_RESOURCE_DESC desc; + ID3D12Device4 *device4; ID3D12Device *device; uint64_t total = 0; unsigned int i, j; @@ -32185,7 +32186,9 @@ static void test_resource_allocation_info(void) {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; + D3D12_RESOURCE_ALLOCATION_INFO1 infos1[ARRAY_SIZE(texture_tests)] = {0}; D3D12_RESOURCE_DESC desc_array[ARRAY_SIZE(texture_tests)]; + uint64_t sizes[ARRAY_SIZE(texture_tests)]; if (!(device = create_device())) { @@ -32252,7 +32255,10 @@ static void test_resource_allocation_info(void) "Got unexpected alignment %"PRIu64".\n", info.Alignment); check_alignment(info.SizeInBytes, info.Alignment); if (i >= 6) + { total += info.SizeInBytes; + sizes[i] = info.SizeInBytes; + } desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); @@ -32262,6 +32268,7 @@ static void test_resource_allocation_info(void) { check_alignment(info.SizeInBytes, info.Alignment); total += info.SizeInBytes; + sizes[i] = info.SizeInBytes; } else { @@ -32289,6 +32296,36 @@ static void test_resource_allocation_info(void) check_alignment(info.SizeInBytes, info.Alignment); ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) + { + ID3D12Device4_GetResourceAllocationInfo1(device4, 0, ARRAY_SIZE(desc_array), desc_array, infos1); + ok(!infos1[0].Offset, "Got unexpected offset %"PRIu64".\n", infos1[0].Offset); + + for (i = 0; i < ARRAY_SIZE(infos1); ++i) + { + vkd3d_test_push_context("Test %u", i); + + todo + ok(infos1[i].Alignment >= desc_array[i].Alignment, + "Got unexpected alignment %"PRIu64".\n", infos1[i].Alignment); + check_alignment(infos1[i].Offset, infos1[i].Alignment); + check_alignment(infos1[i].SizeInBytes, infos1[i].Alignment); + todo + ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); + + if (!i) + continue; + + ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes, + "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n", + infos1[i - 1].SizeInBytes, infos1[i - 1].Offset, infos1[i].Offset); + + vkd3d_test_pop_context(); + } + + ID3D12Device4_Release(device4); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : vkd3d: Implement GetResourceAllocationInfo1().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: eae4b7b4a28dfd695b81a58163d29282fa2bf7f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eae4b7b4a28dfd695b81a58163d29… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 11:38:26 2024 +1000 vkd3d: Implement GetResourceAllocationInfo1(). --- libs/vkd3d/device.c | 23 ++++++++++++++++++++--- tests/d3d12.c | 8 +++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 964cb16e..0b2e0ace 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3566,8 +3566,16 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device7 * 1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type); } +static void d3d12_resource_allocation_info1_from_vkd3d(D3D12_RESOURCE_ALLOCATION_INFO1 *result, + const struct vkd3d_resource_allocation_info *info) +{ + result->Offset = info->offset; + result->Alignment = info->alignment; + result->SizeInBytes = info->size_in_bytes; +} + static void d3d12_device_get_resource_allocation_info(struct d3d12_device *device, - unsigned int count, const D3D12_RESOURCE_DESC *resource_descs, + D3D12_RESOURCE_ALLOCATION_INFO1 *infos1, unsigned int count, const D3D12_RESOURCE_DESC *resource_descs, D3D12_RESOURCE_ALLOCATION_INFO *result) { struct vkd3d_resource_allocation_info info; @@ -3621,6 +3629,9 @@ static void d3d12_device_get_resource_allocation_info(struct d3d12_device *devic info.offset = align(info.offset, info.alignment); } + if (infos1) + d3d12_resource_allocation_info1_from_vkd3d(&infos1[i], &info); + info.offset += info.size_in_bytes; result->Alignment = max(result->Alignment, info.alignment); @@ -3652,7 +3663,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour debug_ignored_node_mask(visible_mask); - d3d12_device_get_resource_allocation_info(device, count, resource_descs, info); + d3d12_device_get_resource_allocation_info(device, NULL, count, resource_descs, info); return info; } @@ -4175,9 +4186,15 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour UINT count, const D3D12_RESOURCE_DESC *resource_descs, D3D12_RESOURCE_ALLOCATION_INFO1 *info1) { - FIXME("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p, info1 %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device7(iface); + + TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p, info1 %p.\n", iface, info, visible_mask, count, resource_descs, info1); + debug_ignored_node_mask(visible_mask); + + d3d12_device_get_resource_allocation_info(device, info1, count, resource_descs, info); + return info; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 58bd2129..51ee7877 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32298,19 +32298,21 @@ static void test_resource_allocation_info(void) if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) { - ID3D12Device4_GetResourceAllocationInfo1(device4, 0, ARRAY_SIZE(desc_array), desc_array, infos1); + info = ID3D12Device4_GetResourceAllocationInfo1(device4, 0, ARRAY_SIZE(desc_array), desc_array, infos1); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(!infos1[0].Offset, "Got unexpected offset %"PRIu64".\n", infos1[0].Offset); for (i = 0; i < ARRAY_SIZE(infos1); ++i) { vkd3d_test_push_context("Test %u", i); - todo ok(infos1[i].Alignment >= desc_array[i].Alignment, "Got unexpected alignment %"PRIu64".\n", infos1[i].Alignment); check_alignment(infos1[i].Offset, infos1[i].Alignment); check_alignment(infos1[i].SizeInBytes, infos1[i].Alignment); - todo ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); if (!i)

1 0