January 2022 - Wine-commits

Alexandre Julliard : Wine release 7.0-rc6
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: website Branch: master Commit: b773a40fa21981841d6381135c2c540e89d412ab URL: https://source.winehq.org/git/website.git/?a=commit;h=b773a40fa21981841d638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 22:11:32 2022 +0100 Wine release 7.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022011401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022011401.xml b/news/en/2022011401.xml new file mode 100644 index 00000000..acd7dabe --- /dev/null +++ b/news/en/2022011401.xml @@ -0,0 +1,13 @@ +<news> +<date>January 14, 2022</date> +<title>Wine 7.0-rc6 Released</title> +<body> + The Wine development release 7.0-rc6 is now available. This is expected to be the last release candidate before the final 7.0. + <a href="{$root}/announce/7.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Andrew Eikum : winecoreaudio.drv: Fix memory leak.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: master Commit: 9bc545451b3ef2015a24532a0ad2605d738739a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc545451b3ef2015a24532a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 14 10:04:11 2022 -0600 winecoreaudio.drv: Fix memory leak. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 3f694b95a49..a2bbc3e45c9 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -709,6 +709,7 @@ static NTSTATUS release_stream( void *args ) { struct release_stream_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; if(stream->unit){ AudioOutputUnitStop(stream->unit); @@ -719,12 +720,16 @@ static NTSTATUS release_stream( void *args ) free(stream->resamp_buffer); free(stream->wrap_buffer); free(stream->cap_buffer); - if(stream->local_buffer) + if(stream->local_buffer){ + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - &stream->local_buffer_size, MEM_RELEASE); - if(stream->tmp_buffer) + &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + &size, MEM_RELEASE); + } free(stream->fmt); free(stream); params->result = S_OK; @@ -1354,8 +1359,9 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ + SIZE_T size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + &size, MEM_RELEASE); stream->tmp_buffer = NULL; } stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign;

1 0

Andrew Eikum : winepulse.drv: Fix memory leak.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: master Commit: 6fa197c3ec60066256bd8b847cc79ff8f743c6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa197c3ec60066256bd8b84… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 14 10:04:17 2022 -0600 winepulse.drv: Fix memory leak. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index bd886e0d879..356f68e0db2 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -928,6 +928,7 @@ static NTSTATUS pulse_release_stream(void *args) { struct release_stream_params *params = args; struct pulse_stream *stream = params->stream; + SIZE_T size; if(params->timer) { stream->please_quit = TRUE; @@ -944,12 +945,16 @@ static NTSTATUS pulse_release_stream(void *args) pa_stream_unref(stream->stream); pulse_unlock(); - if (stream->tmp_buffer) + if (stream->tmp_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_bytes, MEM_RELEASE); - if (stream->local_buffer) + &size, MEM_RELEASE); + } + if (stream->local_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - &stream->alloc_size, MEM_RELEASE); + &size, MEM_RELEASE); + } free(stream->peek_buffer); free(stream); return STATUS_SUCCESS; @@ -1514,13 +1519,16 @@ static NTSTATUS pulse_reset(void *args) static BOOL alloc_tmp_buffer(struct pulse_stream *stream, SIZE_T bytes) { + SIZE_T size; + if (stream->tmp_buffer_bytes >= bytes) return TRUE; if (stream->tmp_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_bytes, MEM_RELEASE); + &size, MEM_RELEASE); stream->tmp_buffer = NULL; stream->tmp_buffer_bytes = 0; }

1 0

Zebediah Figura : ws2_32: Cast timeval fields to LONGLONG before multiplying.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: master Commit: 894679ced80ec4bbedff37babae3f89592bd7ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894679ced80ec4bbedff37ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 13 19:16:14 2022 -0600 ws2_32: Cast timeval fields to LONGLONG before multiplying. WXWORK passes 300 seconds, which overflows 32-bit multiplication. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52383 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0f12a8b8d4a..a7e3e0ab0d7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2409,7 +2409,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, } if (timeout) - params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; + params->timeout = (LONGLONG)timeout->tv_sec * -10000000 + (LONGLONG)timeout->tv_usec * -10; else params->timeout = TIMEOUT_INFINITE;

1 0

Zebediah Figura : ws2_32: Cast the WSAPoll() timeout to LONGLONG before multiplying.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: master Commit: c0d20bb3c06e299ac398a125e5ae93f19ebebe3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0d20bb3c06e299ac398a125… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 13 19:16:15 2022 -0600 ws2_32: Cast the WSAPoll() timeout to LONGLONG before multiplying. This is not particularly likely to overflow, but there is no harm in being careful. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a7e3e0ab0d7..fe7e4fb3464 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2574,7 +2574,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) return SOCKET_ERROR; } - params->timeout = (timeout >= 0 ? timeout * -10000 : TIMEOUT_INFINITE); + params->timeout = (timeout >= 0 ? (LONGLONG)timeout * -10000 : TIMEOUT_INFINITE); for (i = 0; i < count; ++i) {

1 0

Alexandre Julliard : Release 7.0-rc6.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: master Commit: b2f75a026f14805888a4b91d8a2e2c60a35fc1b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2f75a026f14805888a4b91d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 22:09:14 2022 +0100 Release 7.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 241 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 ++--- 3 files changed, 133 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2f75a026f14805888a4…

1 0

Tag wine-7.0-rc6 : Alexandre Julliard : Release 7.0-rc6
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: wine Branch: refs/tags/wine-7.0-rc6 Tag: d6f594f22e79115a9b60e87a7a92ed44f494398b URL: https://source.winehq.org/git/wine.git/?a=tag;h=d6f594f22e79115a9b60e87a7a9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 22:09:14 2022 +0100 Release 7.0-rc6

1 0

Conor McCarthy : tests: Avoid -Wstringop-overread warnings from GCC 11.1+.
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: vkd3d Branch: master Commit: 2047bfa664f36b38b7bb0abfc9bac4acd36145a1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2047bfa664f36b38b7bb0ab… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jan 15 01:17:18 2022 +1000 tests: Avoid -Wstringop-overread warnings from GCC 11.1+. It's technically correct in warning about overwriting the entire vec4 from the address of .x, if a bit overzealous. It's probably a good warning to keep enabled. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b03bb5f..0d706df 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4737,7 +4737,7 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, (const float *)&array_colors[i], 0, NULL); } transition_resource_state(command_list, resource, @@ -4768,7 +4768,7 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, (const float *)&array_colors[i], 0, NULL); } transition_resource_state(command_list, resource, @@ -5703,7 +5703,7 @@ static void test_unknown_rtv_format(void) create_render_target(&context, &desc, &render_targets[1], &rtvs[2]); for (i = 0; i < ARRAY_SIZE(rtvs); ++i) - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], (const float *)&white, 0, NULL); /* NULL RTV */ memset(&rtv_desc, 0, sizeof(rtv_desc)); @@ -14123,7 +14123,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14161,7 +14161,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_offset, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14199,7 +14199,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_green, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14237,7 +14237,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_po, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14273,7 +14273,7 @@ static void test_gather(void) constants.offset_x = 0; constants.offset_y = 0; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14463,7 +14463,7 @@ static void test_gather_c(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_c, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14501,7 +14501,7 @@ static void test_gather_c(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_po_c, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14537,7 +14537,7 @@ static void test_gather_c(void) constants.offset_x = 0; constants.offset_y = 0; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -15388,7 +15388,7 @@ static void test_multisample_array_texture(void) rtv_desc.Texture2DMSArray.ArraySize = 1; ID3D12Device_CreateRenderTargetView(device, texture, &rtv_desc, cpu_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, &colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, (const float *)&colors[i], 0, NULL); } transition_resource_state(command_list, texture,

1 0

Conor McCarthy : tests: Add tests for ID3D12CommandQueue_GetClockCalibration().
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: vkd3d Branch: master Commit: 3d044c4453087acc43aafb4e94dac4970661f0b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d044c4453087acc43aafb4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jan 15 01:17:19 2022 +1000 tests: Add tests for ID3D12CommandQueue_GetClockCalibration(). Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 30 ++++++++++++++++++++++++++++++ tests/d3d12_crosstest.h | 14 ++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0d706df..9d4fb7d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36013,6 +36013,35 @@ done: destroy_test_context(&context); } +static void test_clock_calibration(void) +{ + uint64_t cpu_times[2] = {0}, gpu_times[2] = {0}; + struct test_context context; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + + hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[0], &cpu_times[0]); + todo + ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); + + vkd3d_sleep(100); + + hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[1], &cpu_times[1]); + todo + ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); + + todo + ok(gpu_times[1] > gpu_times[0], "Inconsistent GPU timestamps %"PRIu64" and %"PRIu64".\n", + gpu_times[0], gpu_times[1]); + todo + ok(cpu_times[1] > cpu_times[0], "Inconsistent CPU timestamps %"PRIu64" and %"PRIu64".\n", + cpu_times[0], cpu_times[1]); + + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -36190,4 +36219,5 @@ START_TEST(d3d12) run_test(test_resource_arrays); run_test(test_unbounded_resource_arrays); run_test(test_unbounded_samplers); + run_test(test_clock_calibration); } diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 0b77bde..fc76180 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -60,6 +60,7 @@ typedef int HRESULT; #else # define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 # include <pthread.h> +# include <unistd.h> # include "vkd3d.h" # include "vkd3d_utils.h" #endif @@ -203,6 +204,19 @@ static inline bool join_thread(HANDLE untyped_thread) } #endif +#ifdef _WIN32 +static inline void vkd3d_sleep(unsigned int ms) +{ + Sleep(ms); +} + +#else +static inline void vkd3d_sleep(unsigned int ms) +{ + usleep(1000 * ms); +} +#endif + static HRESULT wait_for_fence(ID3D12Fence *fence, uint64_t value) { unsigned int ret;

1 0

Conor McCarthy : tests: Set the wrong descriptor heaps in test_descriptor_tables().
by Alexandre Julliard 14 Jan '22

14 Jan '22

Module: vkd3d Branch: master Commit: fa8956940cba95ad7f4826658cd06da54538b42e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa8956940cba95ad7f48266… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 13 15:31:05 2022 +1000 tests: Set the wrong descriptor heaps in test_descriptor_tables(). Has no effect in Windows at least on AMD. Not calling SetDescriptorHeaps() at all has no effect in Windows on any hardware so this is likely to be universal too. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2507974..b03bb5f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16067,7 +16067,7 @@ static void test_srv_component_mapping(void) static void test_descriptor_tables(void) { - ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + ID3D12DescriptorHeap *heap, *sampler_heap, *wrong_heap, *wrong_sampler_heap, *heaps[2]; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_range[4]; D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; @@ -16194,6 +16194,8 @@ static void test_descriptor_tables(void) heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); + wrong_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); + wrong_sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); @@ -16237,7 +16239,7 @@ static void test_descriptor_tables(void) ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - heaps[0] = heap; heaps[1] = sampler_heap; + heaps[0] = wrong_heap; heaps[1] = wrong_sampler_heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1, @@ -16258,6 +16260,8 @@ static void test_descriptor_tables(void) ID3D12Resource_Release(textures[i]); ID3D12DescriptorHeap_Release(heap); ID3D12DescriptorHeap_Release(sampler_heap); + ID3D12DescriptorHeap_Release(wrong_heap); + ID3D12DescriptorHeap_Release(wrong_sampler_heap); destroy_test_context(&context); }

1 0