January 2024 - Wine-commits

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_list_Release().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 298dce541db1c6ce0f97baa9a33565fb4f1e110b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/298dce541db1c6ce0f97baa9a3356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:28:06 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_list_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9648a9f4..2307659d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2335,7 +2335,7 @@ static void vkd3d_pipeline_bindings_cleanup(struct vkd3d_pipeline_bindings *bind static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&list->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&list->refcount); TRACE("%p decreasing refcount to %u.\n", list, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_queue_AddRef().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: cdb559c39d5380caff91535969d91abbd57bc935 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cdb559c39d5380caff91535969d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:25:46 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_queue_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2307659d..69516663 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6230,7 +6230,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_QueryInterface(ID3D12Comman static ULONG STDMETHODCALLTYPE d3d12_command_queue_AddRef(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - ULONG refcount = InterlockedIncrement(&command_queue->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&command_queue->refcount); TRACE("%p increasing refcount to %u.\n", command_queue, refcount); @@ -6272,7 +6272,7 @@ static void d3d12_command_queue_op_array_destroy(struct d3d12_command_queue_op_a static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - ULONG refcount = InterlockedDecrement(&command_queue->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&command_queue->refcount); TRACE("%p decreasing refcount to %u.\n", command_queue, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index de7a129a..a6e8c0a7 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1622,7 +1622,7 @@ struct d3d12_command_queue_op_array struct d3d12_command_queue { ID3D12CommandQueue ID3D12CommandQueue_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_QUEUE_DESC desc;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_queue_Release().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 0ff20e6b8dfbdf8b11169b4f339ef2d10a39f558 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ff20e6b8dfbdf8b11169b4f339ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:26:56 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_queue_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 69516663..840bc1a8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6272,7 +6272,7 @@ static void d3d12_command_queue_op_array_destroy(struct d3d12_command_queue_op_a static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&command_queue->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&command_queue->refcount); TRACE("%p decreasing refcount to %u.\n", command_queue, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_signature_AddRef().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 13ba36bb43b0448abebc0cb477559984066cf23e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13ba36bb43b0448abebc0cb477559… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:29:14 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_signature_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 840bc1a8..b5a46a1d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -7442,7 +7442,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_QueryInterface(ID3D12Co static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - ULONG refcount = InterlockedIncrement(&signature->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&signature->refcount); TRACE("%p increasing refcount to %u.\n", signature, refcount); @@ -7452,7 +7452,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSigna static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - ULONG refcount = InterlockedDecrement(&signature->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&signature->refcount); TRACE("%p decreasing refcount to %u.\n", signature, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a6e8c0a7..64a01c41 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1657,7 +1657,7 @@ HRESULT d3d12_command_queue_create(struct d3d12_device *device, struct d3d12_command_signature { ID3D12CommandSignature ID3D12CommandSignature_iface; - LONG refcount; + unsigned int refcount; unsigned int internal_refcount; D3D12_COMMAND_SIGNATURE_DESC desc;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_signature_Release().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 3295f0d16eeb834c0165703198fa1038629ad805 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3295f0d16eeb834c0165703198fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:30:16 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_signature_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b5a46a1d..3cf58e06 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -7452,7 +7452,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSigna static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&signature->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&signature->refcount); TRACE("%p decreasing refcount to %u.\n", signature, refcount);

1 0

Giovanni Mascellani : tests: Mark a test related to instanced draws as buggy on MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 17f3f2914ea95f0801b08a3fe7b40fb8643ea994 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17f3f2914ea95f0801b08a3fe7b40… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Dec 30 22:05:48 2023 +0100 tests: Mark a test related to instanced draws as buggy on MoltenVK. I haven't been able to understand what's happening here exactly, but it doesn't look like we're generating bad Vulkan calls. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 73253f54..c75e112f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25877,7 +25877,13 @@ static void test_instance_id(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(expected_results); ++j) + { + /* MoltenVK seems to have a bug with instanced draws when + * the instance data step rate is zero: in some cases + * StartVertexLocation seems to be ignored. */ + bug_if(is_mvk_device(context.device) && i == 0 && 8 <= j && j < 12) check_readback_data_uint(&rb.rb, &expected_results[j].box, tests[i].expected_colors[j], 1); + } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, render_target,

1 0

Giovanni Mascellani : tests: Mark ReadFromSubresource() and WriteToSubresource() as todo on MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 586ebeafecd41dbeaf529f47e5d88287ddea544e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/586ebeafecd41dbeaf529f47e5d88… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Oct 28 04:07:06 2023 +0200 tests: Mark ReadFromSubresource() and WriteToSubresource() as todo on MoltenVK. --- tests/d3d12.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c75e112f..39e7013d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34035,11 +34035,11 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Empty box */ @@ -34078,20 +34078,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -34113,14 +34113,14 @@ static void test_read_write_subresource(void) /* Read region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Read region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); for (z = 0; z < 64; ++z) @@ -34146,7 +34146,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); vkd3d_test_pop_context(); } @@ -34196,7 +34196,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo_if(is_nvidia_device(device)) + todo_if(is_nvidia_device(device) || is_mvk_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb);

1 0

Giovanni Mascellani : tests: Mark geometry shaders as buggy on MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 74a14dad28ee2366aa6edad821743e476da6666b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74a14dad28ee2366aa6edad821743… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 20:21:56 2024 +0100 tests: Mark geometry shaders as buggy on MoltenVK. --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 39e7013d..4c218d83 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27923,6 +27923,7 @@ static void test_geometry_shader(void) color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 320, 240, 0); + bug_if(is_mvk_device(device)) ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); @@ -27937,6 +27938,7 @@ static void test_geometry_shader(void) color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 320, 240, 0); + bug_if(is_mvk_device(device)) ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); @@ -28142,12 +28144,15 @@ static void test_layered_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); reset_command_list(command_list, context.allocator); check_sub_resource_uint(context.render_target, 1, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 2, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); + bug_if(is_mvk_device(device)) check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0); ID3D12Resource_Release(vb);

1 0

Giovanni Mascellani : tests: Mark the tessellation pipeline as buggy on MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: b6c1e6dcdfbb2d852e685f8797cd330d3a4c56b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b6c1e6dcdfbb2d852e685f8797cd3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 21:17:46 2024 +0100 tests: Mark the tessellation pipeline as buggy on MoltenVK. --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4c218d83..06e67f9c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29752,6 +29752,7 @@ static void test_hull_shader_fork_phase(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff000000, 0); destroy_test_context(&context); @@ -30409,7 +30410,7 @@ static void test_tessellation_primitive_id(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - bug_if(is_nvidia_device(context.device)) + bug_if(is_nvidia_device(context.device) || is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); ID3D12Resource_Release(vb);

1 0

Giovanni Mascellani : tests: Mark a depth sampling test as buggy on MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: c5469c85e83b8ab782fed140cb1e519388b0600e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5469c85e83b8ab782fed140cb1e5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 5 13:46:57 2024 +0100 tests: Mark a depth sampling test as buggy on MoltenVK. MoltenVK seems to be unable to handle tight inequalities (i.e., 0.5 <= 0.5) properly on 16 bit depth resources. --- tests/d3d12.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 06e67f9c..46d8bad7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20549,12 +20549,12 @@ static void test_depth_clip(void) destroy_test_context(&context); } -#define check_depth_stencil_sampling(a, b, c, d, e, f, g) \ - check_depth_stencil_sampling_(__LINE__, a, b, c, d, e, f, g) +#define check_depth_stencil_sampling(a, b, c, d, e, f, g, h) \ + check_depth_stencil_sampling_(__LINE__, a, b, c, d, e, f, g, h) static void check_depth_stencil_sampling_(unsigned int line, struct test_context *context, ID3D12PipelineState *pso, ID3D12Resource *cb, ID3D12Resource *texture, D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle, ID3D12DescriptorHeap *srv_heap, - float expected_value) + float expected_value, bool is_bug) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; ID3D12GraphicsCommandList *command_list; @@ -20585,6 +20585,7 @@ static void check_depth_stencil_sampling_(unsigned int line, struct test_context transition_sub_resource_state(command_list, context->render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_bug) check_sub_resource_float_(line, context->render_target, 0, queue, command_list, expected_value, 2); reset_command_list(command_list, context->allocator); @@ -20738,6 +20739,7 @@ static void test_depth_stencil_sampling(void) DXGI_FORMAT dsv_format; DXGI_FORMAT depth_view_format; DXGI_FORMAT stencil_view_format; + bool is_mvk_bug; } tests[] = { @@ -20747,8 +20749,10 @@ static void test_depth_stencil_sampling(void) DXGI_FORMAT_R32_FLOAT}, {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_X24_TYPELESS_G8_UINT}, + /* For 16 bit depth MoltenVK doesn't handle properly the case + * when the comparison is tight (i.e., 0.5 <= 0.5). */ {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_D16_UNORM, - DXGI_FORMAT_R16_UNORM}, + DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_UNKNOWN, true}, }; memset(&desc, 0, sizeof(desc)); @@ -20851,39 +20855,40 @@ static void test_depth_stencil_sampling(void) /* pso_compare */ ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, + tests[i].is_mvk_bug && is_mvk_device(device)); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 0.0f, false); ps_constant.x = 0.7f; update_buffer_data(cb, 0, sizeof(ps_constant), &ps_constant); reset_command_list(command_list, context.allocator); - check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_compare, cb, texture, dsv_handle, srv_heap, 1.0f, false); /* pso_depth */ reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 1.0f); + check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 1.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 0.2f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 0.2f); + check_depth_stencil_sampling(&context, pso_depth, cb, texture, dsv_handle, srv_heap, 0.2f, false); if (!tests[i].stencil_view_format) { @@ -20907,33 +20912,33 @@ static void test_depth_stencil_sampling(void) reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 0.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 100, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 100.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 100.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_STENCIL, 0.0f, 255, 0, NULL); - check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 255.0f); + check_depth_stencil_sampling(&context, pso_stencil, cb, texture, dsv_handle, srv_heap, 255.0f, false); /* pso_depth_stencil */ reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.3f, 3, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 3.3f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 3.3f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 1.0f, 3, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 4.0f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 4.0f, false); reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0, 0, NULL); - check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 0.0f); + check_depth_stencil_sampling(&context, pso_depth_stencil, cb, texture, dsv_handle, srv_heap, 0.0f, false); destroy_depth_stencil(&ds);

1 0