March 2024 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/spirv: Handle the ORD and UNO instructions.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: e65055b435c25040f286369a28df73732a811519 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e65055b435c25040f286369a28df7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 5 00:39:14 2024 +1000 vkd3d-shader/spirv: Handle the ORD and UNO instructions. --- libs/vkd3d-shader/spirv.c | 37 +++++++++++++++++++++++++++++++++ tests/hlsl/float-comparison.shader_test | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c0cbdccf..70ff1a5b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1524,6 +1524,19 @@ static uint32_t vkd3d_spirv_build_op_logical_equal(struct vkd3d_spirv_builder *b SpvOpLogicalEqual, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_logical_or(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpLogicalOr, result_type, operand0, operand1); +} + +static uint32_t vkd3d_spirv_build_op_logical_not(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpLogicalNot, result_type, operand); +} + static uint32_t vkd3d_spirv_build_op_convert_utof(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t unsigned_value) { @@ -7686,6 +7699,26 @@ static void spirv_compiler_emit_comparison_instruction(struct spirv_compiler *co spirv_compiler_emit_store_reg(compiler, &dst->reg, dst->write_mask, result_id); } +static void spirv_compiler_emit_orderedness_instruction(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, src0_id, src1_id, val_id; + + type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); + src0_id = spirv_compiler_emit_load_src(compiler, &src[0], dst->write_mask); + src1_id = spirv_compiler_emit_load_src(compiler, &src[1], dst->write_mask); + /* OpOrdered and OpUnordered are only available in Kernel mode. */ + src0_id = vkd3d_spirv_build_op_is_nan(builder, type_id, src0_id); + src1_id = vkd3d_spirv_build_op_is_nan(builder, type_id, src1_id); + val_id = vkd3d_spirv_build_op_logical_or(builder, type_id, src0_id, src1_id); + if (instruction->handler_idx == VKD3DSIH_ORD) + val_id = vkd3d_spirv_build_op_logical_not(builder, type_id, val_id); + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + static uint32_t spirv_compiler_emit_conditional_branch(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction, uint32_t target_block_id) { @@ -9671,6 +9704,10 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_ULT: spirv_compiler_emit_comparison_instruction(compiler, instruction); break; + case VKD3DSIH_ORD: + case VKD3DSIH_UNO: + spirv_compiler_emit_orderedness_instruction(compiler, instruction); + break; case VKD3DSIH_BFI: case VKD3DSIH_IBFE: case VKD3DSIH_UBFE: diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 0a3e56f8..619e62f8 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -40,7 +40,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 1.5 1.5 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad % SM1-3 apparently treats '0/0' as zero. if(sm<4) todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 11.0) % SM4-5 optimises away the 'not' by inverting the condition, even though this is invalid for NaN.

1 0

Conor McCarthy : vkd3d: Implement GetCopyableFootprints1().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 4dafd6bedf2fc1b80c70b733e1e034c612a1c5a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4dafd6bedf2fc1b80c70b733e1e03… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 3 00:03:07 2024 +1000 vkd3d: Implement GetCopyableFootprints1(). --- libs/vkd3d/device.c | 16 ++++++---------- tests/d3d12.c | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9f6162d3..da9c1d96 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4593,19 +4593,15 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints1(ID3D12Device8 UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { - FIXME("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", " - "layouts %p, row_counts %p, row_sizes %p, total_bytes %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + + TRACE("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", " + "layouts %p, row_counts %p, row_sizes %p, total_bytes %p.\n", iface, desc, first_sub_resource, sub_resource_count, base_offset, layouts, row_counts, row_sizes, total_bytes); - if (layouts) - memset(layouts, 0xff, sizeof(*layouts) * sub_resource_count); - if (row_counts) - memset(row_counts, 0xff, sizeof(*row_counts) * sub_resource_count); - if (row_sizes) - memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count); - if (total_bytes) - *total_bytes = UINT64_MAX; + d3d12_device_get_copyable_footprints(device, desc, first_sub_resource, sub_resource_count, + base_offset, layouts, row_counts, row_sizes, total_bytes); } static const struct ID3D12Device8Vtbl d3d12_device_vtbl = diff --git a/tests/d3d12.c b/tests/d3d12.c index 04b23de8..49b40a67 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20321,7 +20321,6 @@ static void test_get_copyable_footprints(void) total_size = 0; ID3D12Device8_GetCopyableFootprints1(device8, &resource_desc1, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); - todo check_copyable_footprints(&resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size);

1 0

Conor McCarthy : vkd3d-shader/dxil: Support FCMP_ORD and FCMP_UNO for CMP2.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: f212aad0ff3f317d747223cad75ae8737e95dfee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f212aad0ff3f317d747223cad75ae… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 5 00:38:46 2024 +1000 vkd3d-shader/dxil: Support FCMP_ORD and FCMP_UNO for CMP2. --- libs/vkd3d-shader/d3d_asm.c | 2 ++ libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 8591d2be..21212ae0 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -250,6 +250,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_NOT ] = "not", [VKD3DSIH_NRM ] = "nrm", [VKD3DSIH_OR ] = "or", + [VKD3DSIH_ORD ] = "ord", [VKD3DSIH_PHASE ] = "phase", [VKD3DSIH_PHI ] = "phi", [VKD3DSIH_POW ] = "pow", @@ -321,6 +322,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UMAX ] = "umax", [VKD3DSIH_UMIN ] = "umin", [VKD3DSIH_UMUL ] = "umul", + [VKD3DSIH_UNO ] = "uno", [VKD3DSIH_USHR ] = "ushr", [VKD3DSIH_UTOD ] = "utod", [VKD3DSIH_UTOF ] = "utof", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 26a8a5c1..a202d208 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5187,8 +5187,8 @@ static const struct sm6_cmp_info *sm6_map_cmp2_op(uint64_t code) [FCMP_OLT] = {VKD3DSIH_LTO}, [FCMP_OLE] = {VKD3DSIH_GEO, true}, [FCMP_ONE] = {VKD3DSIH_NEO}, - [FCMP_ORD] = {VKD3DSIH_INVALID}, - [FCMP_UNO] = {VKD3DSIH_INVALID}, + [FCMP_ORD] = {VKD3DSIH_ORD}, + [FCMP_UNO] = {VKD3DSIH_UNO}, [FCMP_UEQ] = {VKD3DSIH_EQU}, [FCMP_UGT] = {VKD3DSIH_LTU, true}, [FCMP_UGE] = {VKD3DSIH_GEU}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c09f6a3a..831fb9bc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -446,6 +446,7 @@ enum vkd3d_shader_opcode VKD3DSIH_NOT, VKD3DSIH_NRM, VKD3DSIH_OR, + VKD3DSIH_ORD, VKD3DSIH_PHASE, VKD3DSIH_PHI, VKD3DSIH_POW, @@ -517,6 +518,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UMAX, VKD3DSIH_UMIN, VKD3DSIH_UMUL, + VKD3DSIH_UNO, VKD3DSIH_USHR, VKD3DSIH_UTOD, VKD3DSIH_UTOF,

1 0

Conor McCarthy : tests/shader-runner: Add a test for FCMP_ORD (is ordered).
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 94583815bc72df9c53c9c45df1616467d48c5358 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/94583815bc72df9c53c9c45df1616… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 5 00:36:57 2024 +1000 tests/shader-runner: Add a test for FCMP_ORD (is ordered). --- tests/hlsl/float-comparison.shader_test | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index b6654344..0a3e56f8 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -32,41 +32,26 @@ float4 main() : sv_target result.z += (n != f.y) ? 100000.0 : 0.0; result.z += !(n == f.y) ? 1000000.0 : 0.0; result.z += !(n != f.y) ? 10000000.0 : 0.0; - /* It doesn't seem possible to generate DXIL instructions for 'is ordered' or 'is unordered'. - * Expressions 'isnan(n)' and '(isnan(n) || isnan(f.x))' compile into intrinsics. */ - result.w = 0; + // These compile to FCMP_ORD, but prepending a ! does not result in FCMP_UNO + result.w = (f.y < f.x || f.y >= f.x) ? 1.0 : 0.0; + result.w += (n < f.x || n >= f.x) ? 10.0 : 0.0; return result; } -% SM1-3 apparently treats '0/0' as zero. -[require] -shader model < 4.0 - [test] uniform 0 float4 0.0 1.5 1.5 0.0 -todo(sm<4) draw quad -todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 0.0) - +todo(sm<4 | sm>=6) draw quad +% SM1-3 apparently treats '0/0' as zero. +if(sm<4) todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 11.0) % SM4-5 optimises away the 'not' by inverting the condition, even though this is invalid for NaN. -[require] -shader model >= 4.0 -shader model < 6.0 +if(sm>=4 & sm<6) todo probe all rgba (1010101.0, 0.0, 1101001.0, 1.0) +% SM6 emits the correct ordered/unordered instructions, so comparisons are false for NaN, and are made true with 'not'. +if(sm>=6) probe all rgba (1010101.0, 11110000.0, 1101001.0, 1.0) -[test] -uniform 0 float4 0.0 1.5 1.5 0.0 -draw quad -todo probe all rgba (1010101.0, 0.0, 1101001.0, 0.0) -% SM6 emits the correct ordered/unordered instructions, so comparisons are false for NaN, and are made true with 'not'. [require] shader model >= 6.0 -[test] -uniform 0 float4 0.0 1.5 1.5 0.0 -draw quad -probe all rgba (1010101.0, 11110000.0, 1101001.0, 0.0) - - [pixel shader] uniform float4 f;

1 0

Conor McCarthy : vkd3d: Implement CreatePlacedResource1().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 197f16efa9ceec4046cb940613b0b8fe0d76685d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/197f16efa9ceec4046cb940613b0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 3 00:09:45 2024 +1000 vkd3d: Implement CreatePlacedResource1(). --- libs/vkd3d/device.c | 17 ++++++++++++++--- tests/d3d12.c | 8 ++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ed278a1a..9f6162d3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4562,12 +4562,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource1(ID3D12Device D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { - FIXME("iface %p, heap %p, heap_offset %#"PRIx64", desc %p, initial_state %#x, " - "optimized_clear_value %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + struct d3d12_heap *heap_object; + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap %p, heap_offset %#"PRIx64", desc %p, initial_state %#x, " + "optimized_clear_value %p, iid %s, resource %p.\n", iface, heap, heap_offset, resource_desc, initial_state, optimized_clear_value, debugstr_guid(iid), resource); - return E_NOTIMPL; + heap_object = unsafe_impl_from_ID3D12Heap(heap); + + if (FAILED(hr = d3d12_placed_resource_create(device, heap_object, heap_offset, + resource_desc, initial_state, optimized_clear_value, &object))) + return hr; + + return return_interface(&object->ID3D12Resource2_iface, &IID_ID3D12Resource2, iid, resource); } static void STDMETHODCALLTYPE d3d12_device_CreateSamplerFeedbackUnorderedAccessView(ID3D12Device8 *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 8066a474..04b23de8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2255,15 +2255,11 @@ static void test_create_placed_resource(void) hr = ID3D12Device8_CreatePlacedResource1(device8, heap, 0, &resource_desc1, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource2, (void **)&resource2); - todo ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); - if (!hr) - { - check_interface(resource2, &IID_ID3D12Resource2, true); - ID3D12Resource2_Release(resource2); - } + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); ID3D12Device8_Release(device8); }

1 0

Conor McCarthy : vkd3d: Implement GetResourceAllocationInfo2().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 6edba86a26dcddbb4767aefa93863182ef2e8d56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6edba86a26dcddbb4767aefa93863… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 15:02:02 2024 +1000 vkd3d: Implement GetResourceAllocationInfo2(). --- libs/vkd3d/device.c | 10 +++++++--- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 2 -- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a8647d15..df74b9c3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4521,11 +4521,15 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, UINT count, const D3D12_RESOURCE_DESC1 *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_ID3D12Device8(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); - info->Alignment = 0; - info->SizeInBytes = ~(uint64_t)0; + debug_ignored_node_mask(visible_mask); + + d3d12_device_get_resource1_allocation_info(device, info1, count, resource_descs, info); + return info; } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7304846f..446ef3ab 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1857,6 +1857,7 @@ static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC1 HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3d12_device *device) { + const D3D12_MIP_REGION *mip_region = &desc->SamplerFeedbackMipRegion; const struct vkd3d_format *format; switch (desc->Dimension) @@ -1926,6 +1927,12 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3 d3d12_validate_resource_flags(desc->Flags); + if (mip_region->Width && mip_region->Height && mip_region->Depth) + { + FIXME("Unhandled sampler feedback mip region size (%u, %u, %u).\n", mip_region->Width, mip_region->Height, + mip_region->Depth); + } + return S_OK; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6d49dbae..9d2cd113 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32428,10 +32428,8 @@ static void test_resource_allocation_info(void) } info = ID3D12Device8_GetResourceAllocationInfo2(device8, 0, ARRAY_SIZE(desc_array1), desc_array1, infos1); - todo ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); - todo 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);

1 0

Conor McCarthy : vkd3d: Implement CreateCommittedResource2().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: e5ae6bd3c2f75cbab379863f2668a5ae982748eb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e5ae6bd3c2f75cbab379863f2668a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 3 00:07:30 2024 +1000 vkd3d: Implement CreateCommittedResource2(). --- libs/vkd3d/device.c | 17 ++++++++++++++--- tests/d3d12.c | 8 ++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index df74b9c3..ed278a1a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4538,12 +4538,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource2(ID3D12Dev D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource) { - FIXME("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, protected_session %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " + "optimized_clear_value %p, protected_session %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, protected_session, debugstr_guid(iid), resource); - return E_NOTIMPL; + if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, protected_session, &object))) + { + *resource = NULL; + return hr; + } + + return return_interface(&object->ID3D12Resource2_iface, &IID_ID3D12Resource2, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource1(ID3D12Device8 *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d2cd113..8066a474 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1879,15 +1879,11 @@ static void test_create_committed_resource(void) hr = ID3D12Device8_CreateCommittedResource2(device8, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc1, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, &IID_ID3D12Resource2, (void **)&resource2); - todo ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); - if (!hr) - { - check_interface(resource2, &IID_ID3D12Resource2, true); - ID3D12Resource2_Release(resource2); - } + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); ID3D12Device8_Release(device8); }

1 0

Conor McCarthy : tests/d3d12: Add tests for GetCopyableFootprints1().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 2ed36efcb5d4c19e224a93ffcc4e932bf57ec232 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2ed36efcb5d4c19e224a93ffcc4e9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:57:45 2024 +1000 tests/d3d12: Add tests for GetCopyableFootprints1(). --- tests/d3d12.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d8baeb2a..6d49dbae 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20068,9 +20068,11 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D static void test_get_copyable_footprints(void) { D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[10]; + D3D12_RESOURCE_DESC1 resource_desc1; uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; unsigned int sub_resource_count; + ID3D12Device8 *device8; unsigned int i, j, k; ID3D12Device *device; UINT row_counts[10]; @@ -20308,6 +20310,32 @@ static void test_get_copyable_footprints(void) check_copyable_footprints(&resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device8, (void **)&device8))) + { + resource_desc1.Dimension = resource_desc.Dimension; + resource_desc1.Alignment = resource_desc.Alignment; + resource_desc1.Width = resource_desc.Width; + resource_desc1.Height = resource_desc.Height; + resource_desc1.DepthOrArraySize = resource_desc.DepthOrArraySize; + resource_desc1.MipLevels = resource_desc.MipLevels; + resource_desc1.Format = resource_desc.Format; + resource_desc1.SampleDesc.Count = resource_desc.SampleDesc.Count; + resource_desc1.SampleDesc.Quality = resource_desc.SampleDesc.Quality; + resource_desc1.Flags = resource_desc.Flags; + memset(&resource_desc1.SamplerFeedbackMipRegion, 0, sizeof(resource_desc1.SamplerFeedbackMipRegion)); + memset(layouts, 0, sizeof(layouts)); + memset(row_counts, 0, sizeof(row_counts)); + memset(row_sizes, 0, sizeof(row_sizes)); + total_size = 0; + ID3D12Device8_GetCopyableFootprints1(device8, &resource_desc1, 0, 1, 0, + layouts, row_counts, row_sizes, &total_size); + todo + check_copyable_footprints(&resource_desc, 0, 1, 0, + layouts, row_counts, row_sizes, &total_size); + + ID3D12Device8_Release(device8); + } + for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i) { resource_desc = invalid_descs[i].resource_desc;

1 0

Conor McCarthy : tests/d3d12: Add tests for CreatePlacedResource1().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 9987b519a2480fc496f0c4c6a6413f8d99bae6fc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9987b519a2480fc496f0c4c6a6413… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:57:04 2024 +1000 tests/d3d12: Add tests for CreatePlacedResource1(). --- tests/d3d12.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index e66e0d6b..d8baeb2a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2142,13 +2142,16 @@ static void test_create_placed_resource(void) { ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; - ID3D12Resource *resource, *resource2; + ID3D12Resource *resource, *resource_2; + D3D12_RESOURCE_DESC1 resource_desc1; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource2 *resource2; ID3D12Resource1 *resource1; D3D12_HEAP_DESC heap_desc; + ID3D12Device8 *device8; ID3D12Heap *heap; unsigned int i; ULONG refcount; @@ -2239,6 +2242,35 @@ static void test_create_placed_resource(void) refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device8, (void **)&device8))) + { + resource_desc1.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc1.Alignment = 0; + resource_desc1.Width = 32; + resource_desc1.Height = 1; + resource_desc1.DepthOrArraySize = 1; + resource_desc1.MipLevels = 1; + resource_desc1.Format = DXGI_FORMAT_UNKNOWN; + resource_desc1.SampleDesc.Count = 1; + resource_desc1.SampleDesc.Quality = 0; + resource_desc1.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc1.Flags = 0; + memset(&resource_desc1.SamplerFeedbackMipRegion, 0, sizeof(resource_desc1.SamplerFeedbackMipRegion)); + + hr = ID3D12Device8_CreatePlacedResource1(device8, heap, 0, + &resource_desc1, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource2, (void **)&resource2); + todo + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + if (!hr) + { + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); + } + + ID3D12Device8_Release(device8); + } + /* The clear value must be NULL for buffers. */ hr = ID3D12Device_CreatePlacedResource(device, heap, 0, &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value, @@ -2261,11 +2293,11 @@ static void test_create_placed_resource(void) ok(!refcount, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, - &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource2); + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource_2); ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); ID3D12Resource_Release(resource); - ID3D12Resource_Release(resource2); + ID3D12Resource_Release(resource_2); for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i) {

1 0

Conor McCarthy : tests/d3d12: Add tests for CreateCommittedResource2().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: c09ae2c93f4e8b829d19cd383966755bfba67a49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c09ae2c93f4e8b829d19cd3839667… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:56:22 2024 +1000 tests/d3d12: Add tests for CreateCommittedResource2(). --- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index efed41e8..e66e0d6b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1507,12 +1507,15 @@ static void test_create_committed_resource(void) ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC1 resource_desc1; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource2 *resource2; ID3D12Resource1 *resource1; ID3D12Resource *resource; + ID3D12Device8 *device8; ID3D12Device4 *device4; unsigned int i; ULONG refcount; @@ -1858,6 +1861,36 @@ static void test_create_committed_resource(void) ID3D12Device4_Release(device4); } + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device8, (void **)&device8))) + { + resource_desc1.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc1.Alignment = 0; + resource_desc1.Width = 32; + resource_desc1.Height = 32; + resource_desc1.DepthOrArraySize = 1; + resource_desc1.MipLevels = 1; + resource_desc1.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc1.SampleDesc.Count = 1; + resource_desc1.SampleDesc.Quality = 0; + resource_desc1.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc1.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + memset(&resource_desc1.SamplerFeedbackMipRegion, 0, sizeof(resource_desc1.SamplerFeedbackMipRegion)); + + hr = ID3D12Device8_CreateCommittedResource2(device8, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc1, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, + &IID_ID3D12Resource2, (void **)&resource2); + todo + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + + if (!hr) + { + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); + } + + ID3D12Device8_Release(device8); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0