September 2019 - Wine-Devel

TestBot News
by Francois Gouget Oct. 4, 2019

Oct. 4, 2019

I updated the debian10 and w1064 VMs so let me know if there are problems. For now they are not base VMs yet, I'ĺl promote them after their first WineTest run. Here's what's new (tl;dr;-style): debian10: OSS4, dual-screen, Spice vdagent, ich9 sound card. (and likely wrong CPU) w1064: New locale snapshots, a dual-screen snapshot (QXL), metered network connection. cw-rx460: New AMD RX 460 GPU - Debian: OSS4, Vulkan, win32 trouble. - Windows: New graphics driver, partial Windows upgrades, some missing disk images. The TestBot feels a bit slow today, maybe because it fell behind while I was working on the VMs. If it continues being slow I may have to rebalance the VMs a bit. debian10 -------- This VM now has two screens. A side effect is that screenshots will sometimes not work. That's only one of many annoyances with multi-head support for Unix guests. You can read all about it there: https://bugs.winehq.org/show_bug.cgi?id=47844 With Unix guests, multi-head support requires installing and running Spice's VDAgent in the guest. The VDAgent servers are meant to integrate the guest environment with the host to simplify copy/paste between them, resizing the guest desktop by resizing the Spice window, etc. Hopefully none of that will interfere with the Wine tests but if it does, let me know. Also if we need to test both single and dual screen configurations then we'll need to duplicate that VM. So let me know if that's needed. In the process upgraded the virtual hardware the VM runs on from QEmu's i440FX to the Q35 platform which is the default nowadays. This should not have any impact on the tests except that the sound card changed from ich6 to ich9. Last thing, when rebuilding the VM I picked the 'Hypervisor default' for the emulated CPU. It's missing support for sse3 which, if I recall correctly, was causing bcrypt failures on Wine. And sure enough the failures are back. So I probably need to tweak the CPU configuration. w1064 ----- This VM has a new snapshot with a dual screen configuration. On windows this is only possible with the QXL graphics card whereas we normally use the VGA one. So this is likely to have an impact on the Direct 3D tests in that snapshot. Details: https://bugs.winehq.org/show_bug.cgi?id=47838 On Windows too the dual-screen configuration may cause the TestBot to 'fail' to produce a useful screenshot from time to time: https://testbot.winehq.org/JobDetails.pl?Key=57142&s205=1#k205 Also one needs to have one graphics cards per screen. So this is slightly different from the debian10 setup where there is a single graphics card with two screens. I also added five new locales: Arabic, French, Hebrew, Japanese and Simplified Chinese. Recreating the live snapshots was almost a breeze thanks to the recent TestBot work. The snag is that it turns out setting the location to a European country causes Windows 10 to through a 'Privacy wizard' when rebooting to have the new locale take effect. Of course that impacted the first locale I tested, French, and broke the automatically created live snapshot. Fortunately now I know what's causing the problem and only one snapshot needs to be created manually. Eventually I will probably demote the wvistau64 locale configurations to only run the daily WineTests or even just deal with jobs that developer manually pick for them. Another change I made is to put the network connection in metered mode. Before this I was blocking the Windows Updates simply by disabling the corresponding service. That worked fine in version 1507 but did not work so well with more recent versions. In particular a reboot would reenable the Windows Update service leading to upgrades takign place. Putting the network connection in metered mode seems to reliably stop Windows update in its tracks and is now easy in 1809 (and a bit more hidden in 1703). However I probably went overboard by setting a 1GB limit (a 100GB limit seems to work just as well) so there are notifications that the quota is exceeded. Let me know if this change is causing problems. Details: https://bugs.winehq.org/show_bug.cgi?id=47854 By the way only the new dual-screen and locale snapshots have the metere network connection. So comparing the results there with those of the old snapshots can help detect issues. If this is not causing trouble I'll eventually go back and do the same change in the other snapshots. cw-rx-460 --------- Not quite part of the TestBot but provides daily real hardware WineTest results. The AMD HD6800 graphics card died so it got replaced by an AMD RX 460 graphics card. On the Debian side I added OSS4 (Faudio is present too) and the new graphics card gains us Vulkan support. Yay! The WineTest results are not great. In particular the wow32 results look ok, but half the time WineTest / the system seems to crash in the middle of the win32 ones. It may just be that it reboots to Windows at the wrong time. The rest of the time the win32 results are on par with the wow32/wow64 ones. I did not have time to dig into this yet. On the Windows side the graphics driver has to be updated for each test configuration of course :-( And while that happens Windows Update starts applying updates :-(( But if the metered network connection trick works out I should be able to make clean updates to the windows images. In the meantime only the Windows 8.1 and Windows 10 1809 configurations are operational. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH] dsound/tests: Add some GetStatus checks
by Alistair Leslie-Hughes Oct. 1, 2019

Oct. 1, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 41818deb17..d242bf6b24 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1063,7 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, DWORD expected) { HRESULT rc; - DWORD ret; + DWORD ret, status; rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, @@ -1076,13 +1076,22 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + rc=IDirectSoundBuffer_Stop(dsb); ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0 /* Stopped */,"got %08x\n", status); + ret=WaitForMultipleObjects(count,event,FALSE,0); ok(ret==expected,"expected %d. got %d\n",expected,ret); + return rc; } @@ -1537,7 +1546,7 @@ static void test_notifications(LPGUID lpGuid) WAVEFORMATEX wfx; DSBPOSITIONNOTIFY notifies[2]; HANDLE handles[2]; - DWORD expect; + DWORD expect, status; int cycles; rc = pDirectSoundCreate(lpGuid, &dso, NULL); @@ -1607,12 +1616,20 @@ static void test_notifications(LPGUID lpGuid) ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + expect = !expect; } rc = IDirectSoundBuffer_Stop(buf); ok(rc == DS_OK, "Stop: %08x\n", rc); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0,"got %08x\n", status); + CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify); -- 2.17.1

2 1

[PATCH v2] vkd3d: Implement ID3D12Resource::WriteToSubresource().
by Rémi Bernon Oct. 1, 2019

Oct. 1, 2019

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- A dumb copy-paste adapted from ID3D12Resource::ReadFromSubresource() that would maybe benefit from factorization. This time with correct success return value and updated tests. It fixes rendering issues for SOTTR on Intel GPU and the main menu now renders correctly (although it crashes later on). libs/vkd3d/resource.c | 109 ++++++++++++++++++++++++++++++++++++++++-- tests/d3d12.c | 14 +++--- 2 files changed, 111 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index aebe1fa..e3dfd70 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1285,12 +1285,111 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc UINT dst_sub_resource, const D3D12_BOX *dst_box, const void *src_data, UINT src_row_pitch, UINT src_slice_pitch) { - FIXME("iface %p, dst_sub_resource %u, dst_box %p, src_data %p, " - "src_row_pitch %u, src_slice_pitch %u stub!\n", - iface, dst_sub_resource, dst_box, - src_data, src_row_pitch, src_slice_pitch); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + const struct vkd3d_vk_device_procs *vk_procs; + VkImageSubresource vk_sub_resource; + const struct vkd3d_format *format; + VkSubresourceLayout vk_layout; + struct d3d12_device *device; + BYTE *dst_data, *dst; + BYTE const *src; + unsigned int y, z; + D3D12_BOX box; + size_t size; + HRESULT hr; + + TRACE("iface %p, src_data %p, src_row_pitch %u, src_slice_pitch %u, " + "dst_sub_resource %u, dst_box %s.\n", + iface, src_data, src_row_pitch, src_slice_pitch, dst_sub_resource, debug_d3d12_box(dst_box)); - return E_NOTIMPL; + if (d3d12_resource_is_buffer(resource)) + { + WARN("Buffers are not supported.\n"); + return E_INVALIDARG; + } + + device = resource->device; + vk_procs = &device->vk_procs; + + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) + { + ERR("Invalid DXGI format %#x.\n", resource->desc.Format); + return E_INVALIDARG; + } + if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + { + FIXME("Not supported for format %#x.\n", format->dxgi_format); + return E_NOTIMPL; + } + + vk_sub_resource.arrayLayer = dst_sub_resource / resource->desc.MipLevels; + vk_sub_resource.mipLevel = dst_sub_resource % resource->desc.MipLevels; + vk_sub_resource.aspectMask = format->vk_aspect_mask; + + if (dst_box) + { + if (!d3d12_resource_validate_box(resource, dst_sub_resource, dst_box)) + { + WARN("Invalid box %s.\n", debug_d3d12_box(dst_box)); + return E_INVALIDARG; + } + + box = *dst_box; + } + else + { + box.left = 0; + box.top = 0; + box.front = 0; + box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); + box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); + box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + } + if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + { + WARN("Empty box %s.\n", debug_d3d12_box(dst_box)); + return S_OK; + } + + if (!d3d12_resource_is_cpu_accessible(resource)) + { + FIXME_ONCE("Not implemented for this resource type.\n"); + return E_NOTIMPL; + } + if (!(resource->flags & VKD3D_RESOURCE_LINEAR_TILING)) + { + FIXME_ONCE("Not implemented for image tiling other than VK_IMAGE_TILING_LINEAR.\n"); + return E_NOTIMPL; + } + + VK_CALL(vkGetImageSubresourceLayout(device->vk_device, resource->u.vk_image, &vk_sub_resource, &vk_layout)); + TRACE("Offset %#"PRIx64", size %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n", + vk_layout.offset, vk_layout.size, vk_layout.rowPitch, vk_layout.depthPitch); + + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, (void **)&dst_data))) + { + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); + return hr; + } + + dst_data += vk_layout.offset; + dst_data += box.left / format->block_width * format->byte_count * format->block_byte_count; + size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = box.front; z < box.back; ++z) + { + src = src_data + (z - box.front) * src_slice_pitch; + dst = dst_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; + for (y = box.top; y < box.bottom; y += format->block_height) + { + memcpy(dst, src, size); + src += src_row_pitch; + dst += vk_layout.rowPitch; + } + } + + d3d12_heap_unmap(resource->heap, resource); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resource *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9c608c1..c7609b8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30429,7 +30429,7 @@ static void test_read_write_subresource(void) set_box(&box, 0, 0, 0, 1, 1, 1); hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -30476,7 +30476,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + 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)) @@ -30489,7 +30489,7 @@ static void test_read_write_subresource(void) set_box(&box, 0, 0, 0, 0, 0, 0); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -30518,18 +30518,18 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + 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 ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + 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 ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else { @@ -30633,7 +30633,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + 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); ID3D12Resource_Release(src_texture); -- 2.23.0

2 1

[PATCH vkd3d 2/2] tests: Add tests for sample_l instruction.
by Jactry Zeng Oct. 1, 2019

Oct. 1, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- tests/d3d12.c | 112 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 90 insertions(+), 22 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b047753..c747779 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -12286,6 +12286,36 @@ static void test_sample_instructions(void) 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_sample_d = {ps_sample_d_code, sizeof(ps_sample_d_code)}; + static const DWORD ps_sample_l_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float level; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleLevel(s, p, level); + } +#endif + 0x43425844, 0x61e05d85, 0x2a7300fb, 0x0a83706b, 0x889d1683, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040, + 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c000048, + 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const unsigned int r8g8b8a8_data[] = { @@ -12338,6 +12368,13 @@ static void test_sample_instructions(void) 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, }; + static const unsigned int lerp_1_2_colors[] = + { + 0xffff7f7f, 0xffff7f7f, 0xff7f007f, 0xff7f007f, + 0xffff7f7f, 0xffff7f7f, 0xff7f007f, 0xff7f007f, + 0xff7f0000, 0xff7f0000, 0xff7f7f00, 0xff7f7f00, + 0xff7f0000, 0xff7f0000, 0xff7f7f00, 0xff7f7f00, + }; struct texture { unsigned int width; @@ -12374,6 +12411,7 @@ static void test_sample_instructions(void) { const D3D12_SHADER_BYTECODE *ps_code; const struct texture *texture; + D3D12_FILTER filter; float lod_bias; float min_lod; float max_lod; @@ -12382,28 +12420,58 @@ static void test_sample_instructions(void) } tests[] = { -#define MIP_MAX D3D12_FLOAT32_MAX - {&ps_sample, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, - {&ps_sample, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, - {&ps_sample_b, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, - {&ps_sample_b, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0}, - {&ps_sample_b, &rgba_texture, 8.0f, 0.0f, MIP_MAX, {0.0f}, level_1_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.0f}, level_1_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.4f}, level_1_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.5f}, level_2_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {9.0f}, level_2_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 2.0f, {1.0f}, rgba_level_0}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 2.0f, {9.0f}, level_2_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 1.0f, {9.0f}, level_1_colors}, - {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 0.0f, {9.0f}, rgba_level_0}, - {&ps_sample_d, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, r8g8b8a8_data}, - {&ps_sample_d, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, a8_expected_data}, - {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, - {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.3f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, - {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.4f, 0.0f, 0.0f, 0.0f}, level_1_colors}, - {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {1.0f, 0.0f, 0.0f, 0.0f}, level_2_colors}, +#define MIP_MAX D3D12_FLOAT32_MAX +#define POINT D3D12_FILTER_MIN_MAG_MIP_POINT +#define POINT_LINEAR D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR + {&ps_sample, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, + {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, + {&ps_sample_b, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, + {&ps_sample_b, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0}, + {&ps_sample_b, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, {0.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.4f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {8.5f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {9.0f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, {1.0f}, rgba_level_0}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, {9.0f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 1.0f, {9.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, {9.0f}, rgba_level_0}, + {&ps_sample_d, &r8g8b8a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, r8g8b8a8_data}, + {&ps_sample_d, &a8_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, a8_expected_data}, + {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, + {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.3f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, + {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.4f, 0.0f, 0.0f, 0.0f}, level_1_colors}, + {&ps_sample_d, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.0f, 0.0f, 0.0f, 0.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {-1.0f}, rgba_level_0}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.4f}, rgba_level_0}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {0.5f}, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.0f}, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.4f}, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {1.5f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {2.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {3.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, {4.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 0.0f, 0.0f, MIP_MAX, {1.5f}, lerp_1_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {-2.0f}, rgba_level_0}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {-1.0f}, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {0.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {1.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 0.0f, MIP_MAX, {1.5f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {-9.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {-1.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {0.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {1.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT_LINEAR, 2.0f, 2.0f, 2.0f, {9.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {-9.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {-1.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {0.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {1.0f}, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, {9.0f}, level_2_colors}, #undef MIP_MAX +#undef POINT +#undef POINT_LINEAR }; memset(&desc, 0, sizeof(desc)); @@ -12459,7 +12527,7 @@ static void test_sample_instructions(void) vkd3d_test_set_context("Test %u", i); memset(&sampler_desc, 0, sizeof(sampler_desc)); - sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.Filter = tests[i].filter; sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; -- 2.23.0

2 1

[PATCH vkd3d 1/2] tests: Add tests for bufinfo instructions.
by Jactry Zeng Oct. 1, 2019

Oct. 1, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- tests/d3d12.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9c608c1..b047753 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31741,6 +31741,371 @@ static void test_conditional_rendering(void) ID3D12PipelineState_Release(pipeline_state); destroy_test_context(&context); } +static void test_bufinfo_instruction(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + const D3D12_SHADER_BYTECODE *current_shader; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_DESCRIPTOR_RANGE descriptor_range; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_ROOT_PARAMETER root_parameter; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12Resource *vb, *buffer; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + HRESULT hr; + int i; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_srv_raw_code[] = + { +#if 0 + ByteAddressBuffer b; + + uint4 main(void) : SV_Target + { + uint width; + b.GetDimensions(width); + return width; + } +#endif + 0x43425844, 0x934bc27a, 0x3251cc9d, 0xa129bdd3, 0xf7cedcc4, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018, + 0x0100086a, 0x030000a1, 0x00107000, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x87000079, 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x00107e46, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_srv_raw = {ps_srv_raw_code, sizeof(ps_srv_raw_code)}; + static const DWORD ps_srv_structured_code[] = + { +#if 0 + StructuredBuffer<bool> b; + + uint4 main(void) : SV_Target + { + uint count, stride; + b.GetDimensions(count, stride); + return uint4(count, stride, 0, 1); + } +#endif + 0x43425844, 0x313f910c, 0x2f60c646, 0x2d87455c, 0xb9988c2c, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x040000a2, 0x00107000, 0x00000000, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80002302, 0x00199983, 0x00100012, 0x00000000, 0x00107e46, + 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, + 0x00000000, 0x00004002, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_srv_structured = {ps_srv_structured_code, sizeof(ps_srv_structured_code)}; + static const DWORD ps_srv_typed_code[] = + { +#if 0 + Buffer<float> b; + + uint4 main(void) : SV_Target + { + uint width; + b.GetDimensions(width); + return width; + } +#endif + 0x43425844, 0x6ae6dbb0, 0x6289d227, 0xaf4e708e, 0x111efed1, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019, + 0x0100086a, 0x04000858, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80000042, 0x00155543, 0x00100012, 0x00000000, 0x00107e46, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_srv_typed = {ps_srv_typed_code, sizeof(ps_srv_typed_code)}; + static const DWORD ps_uav_raw_code[] = + { +#if 0 + RWByteAddressBuffer b; + + uint4 main(void) : SV_Target + { + uint width; + b.GetDimensions(width); + return width; + } +#endif + 0x43425844, 0xb06e9715, 0x99733b00, 0xaa536550, 0x703a01c5, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018, + 0x0100086a, 0x0300009d, 0x0011e000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x87000079, 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_uav_raw = {ps_uav_raw_code, sizeof(ps_uav_raw_code)}; + static const DWORD ps_uav_structured_code[] = + { +#if 0 + struct s + { + uint4 u; + bool b; + }; + + RWStructuredBuffer<s> b; + + uint4 main(void) : SV_Target + { + uint count, stride; + b.GetDimensions(count, stride); + return uint4(count, stride, 0, 1); + } +#endif + 0x43425844, 0xe1900f85, 0x13c1f338, 0xbb19865e, 0x366df28f, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000014, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x8000a302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, + 0x00000000, 0x00004002, 0x00000000, 0x00000014, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_uav_structured = {ps_uav_structured_code, sizeof(ps_uav_structured_code)}; + static const DWORD ps_uav_structured32_code[] = + { +#if 0 + struct s + { + uint4 u; + bool4 b; + }; + + RWStructuredBuffer<s> b; + + uint4 main(void) : SV_Target + { + uint count, stride; + b.GetDimensions(count, stride); + return uint4(count, stride, 0, 1); + } +#endif + 0x43425844, 0xdd87a805, 0x28090470, 0xe4fa7c4d, 0x57963f52, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000020, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80010302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, + 0x00000000, 0x00004002, 0x00000000, 0x00000020, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_uav_structured32 = {ps_uav_structured32_code, sizeof(ps_uav_structured32_code)}; + static const DWORD ps_uav_typed_code[] = + { +#if 0 + RWBuffer<float> b; + + uint4 main(void) : SV_Target + { + uint width; + b.GetDimensions(width); + return width; + } +#endif + 0x43425844, 0x96b39f5f, 0x5fef24c7, 0xed404a41, 0x01c9d4fe, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019, + 0x0100086a, 0x0400089c, 0x0011e000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80000042, 0x00155543, 0x00100012, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_uav_typed = {ps_uav_typed_code, sizeof(ps_uav_typed_code)}; + static const struct test + { + const D3D12_SHADER_BYTECODE *ps; + BOOL uav; + BOOL raw; + unsigned int buffer_size; + unsigned int buffer_structure_byte_stride; + DXGI_FORMAT view_format; + unsigned int view_element_idx; + unsigned int view_element_count; + struct uvec4 expected_result; + } + tests[] = + { + {&ps_srv_raw, false, true, 100, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_srv_raw, false, true, 500, 0, DXGI_FORMAT_R32_TYPELESS, 64, 4, { 16, 16, 16, 16}}, + {&ps_srv_structured, false, false, 100, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}}, + {&ps_srv_structured, false, false, 100, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}}, + {&ps_srv_structured, false, false, 400, 4, DXGI_FORMAT_UNKNOWN, 64, 2, { 2, 4, 0, 1}}, + {&ps_srv_typed, false, false, 200, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, false, false, 400, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_srv_typed, false, false, 100, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, false, false, 400, 0, DXGI_FORMAT_R16_FLOAT, 128, 2, { 2, 2, 2, 2}}, + {&ps_uav_raw, true, true, 100, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_uav_raw, true, true, 512, 0, DXGI_FORMAT_R32_TYPELESS, 64, 64, {256, 256, 256, 256}}, + {&ps_uav_structured, true, false, 100, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}}, + {&ps_uav_structured, true, false, 100, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}}, + {&ps_uav_structured32, true, false, 320, 32, DXGI_FORMAT_UNKNOWN, 8, 2, { 2, 32, 0, 1}}, + {&ps_uav_typed, true, false, 200, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, true, false, 400, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_uav_typed, true, false, 100, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, true, false, 400, 0, DXGI_FORMAT_R16_FLOAT, 128, 1, { 1, 1, 1, 1}}, + }; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 64; + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.no_root_signature = true; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + vb = create_upload_buffer(device, sizeof(quad), quad); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + current_shader = NULL; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const struct test *test = &tests[i]; + + vkd3d_test_set_context("Test %u", i); + + if (!context.root_signature || test->uav != tests[i - 1].uav) + { + if (context.root_signature) + ID3D12RootSignature_Release(context.root_signature); + + descriptor_range.RangeType = test->uav + ? D3D12_DESCRIPTOR_RANGE_TYPE_UAV : D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = test->uav ? 1 : 0; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = 0; + root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameter.DescriptorTable.NumDescriptorRanges = 1; + root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = &root_parameter; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + } + + if (current_shader != test->ps) + { + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + current_shader = test->ps; + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, current_shader, &input_layout); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + } + + if (test->uav) + { + buffer = create_default_buffer(device, test->buffer_size, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = test->view_format; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.Flags = test->raw ? D3D12_BUFFER_UAV_FLAG_RAW : 0; + uav_desc.Buffer.FirstElement = test->view_element_idx; + uav_desc.Buffer.NumElements = test->view_element_count; + uav_desc.Buffer.StructureByteStride = test->buffer_structure_byte_stride;; + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle); + } + else + { + buffer = create_default_buffer(device, test->buffer_size, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = test->view_format; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.Flags = test->raw ? D3D12_BUFFER_SRV_FLAG_RAW : 0; + srv_desc.Buffer.FirstElement = test->view_element_idx; + srv_desc.Buffer.NumElements = test->view_element_count; + srv_desc.Buffer.StructureByteStride = test->buffer_structure_byte_stride; + ID3D12Device_CreateShaderResourceView(device, buffer, &srv_desc, cpu_handle); + } + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &test->expected_result); + reset_command_list(command_list, context.allocator); + + ID3D12Resource_Release(buffer); + } + vkd3d_test_set_context(NULL); + + ID3D12Resource_Release(vb); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} START_TEST(d3d12) { @@ -31903,4 +32268,5 @@ START_TEST(d3d12) run_test(test_graphics_compute_queue_synchronization); run_test(test_early_depth_stencil_tests); run_test(test_conditional_rendering); + run_test(test_bufinfo_instruction); } -- 2.23.0

2 1

[PATCH 1/5] d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW().
by Matteo Bruni Oct. 1, 2019

Oct. 1, 2019

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 022b32bcd8c..8708ed702fd 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -773,7 +773,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, con hr = map_view_of_file(srcfile, &buffer, &size); if (FAILED(hr)) + { + WARN("Failed to open file.\n"); return D3DXERR_INVALIDDATA; + } hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); -- 2.21.0

3 8

[PATCH v2] ntdll: Add exception handling around DbgBreakPoint.
by Akihiro Sagawa Oct. 1, 2019

Oct. 1, 2019

In v2, fix test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47509 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 31 +++++++++++++++++++++++-------- dlls/ntdll/process.c | 19 ++++++++++++++++++- 2 files changed, 41 insertions(+), 9 deletions(-)

2 2

[PATCH] wbemprox: Implement Win32_QuickFixEngineering.
by Hans Leidekker Sept. 30, 2019

Sept. 30, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47755 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++ dlls/wbemprox/tests/query.c | 44 +++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2aca2f8693..96d1e0b850 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR class_processor2W[] = {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; +static const WCHAR class_quickfixengineeringW[] = + {'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; static const WCHAR class_sidW[] = {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = @@ -268,6 +270,8 @@ static const WCHAR prop_graphicsscoreW[] = {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; static const WCHAR prop_horizontalresolutionW[] = {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_hotfixidW[] = + {'H','o','t','F','i','x','I','D',0}; static const WCHAR prop_idW[] = {'I','D',0}; static const WCHAR prop_identificationcodeW[] = @@ -754,6 +758,11 @@ static const struct column col_qualifier[] = { prop_strvalueW, CIM_STRING }, { prop_boolvalueW, CIM_BOOLEAN } }; +static const struct column col_quickfixengineering[] = +{ + { prop_captionW, CIM_STRING }, + { prop_hotfixidW, CIM_STRING|COL_FLAG_KEY } +}; static const struct column col_service[] = { { prop_acceptpauseW, CIM_BOOLEAN }, @@ -920,6 +929,10 @@ static const WCHAR os_serialnumberW[] = {'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0}; static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; +static const WCHAR quickfixengineering_captionW[] = + {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR quickfixengineering_hotfixidW[] = + {'K','B','1','2','3','4','5','6','7',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR systemenclosure_systemenclosureW[] = @@ -1224,6 +1237,11 @@ struct record_qualifier const WCHAR *strvalue; int boolvalue; }; +struct record_quickfixengineering +{ + const WCHAR *caption; + const WCHAR *hotfixid; +}; struct record_service { int accept_pause; @@ -1364,6 +1382,10 @@ static const struct record_qualifier data_qualifier[] = { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, { class_process_getowner_outW, param_domainW, CIM_SINT32, FLAVOR_ID, prop_idW, 1 } }; +static const struct record_quickfixengineering data_quickfixengineering[] = +{ + { quickfixengineering_captionW, quickfixengineering_hotfixidW }, +}; static const struct record_sounddevice data_sounddevice[] = { { sounddevice_productnameW, sounddevice_productnameW, 3 /* enabled */ } @@ -4443,6 +4465,7 @@ static struct table builtin_classes[] = { class_processorW, C(col_processor), 0, 0, NULL, fill_processor }, { class_processor2W, C(col_processor), 0, 0, NULL, fill_processor }, { class_qualifiersW, C(col_qualifier), D(data_qualifier) }, + { class_quickfixengineeringW, C(col_quickfixengineering), D(data_quickfixengineering) }, { class_serviceW, C(col_service), 0, 0, NULL, fill_service }, { class_sidW, C(col_sid), 0, 0, NULL, fill_sid }, { class_sounddeviceW, C(col_sounddevice), D(data_sounddevice) }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index ee4eac88e9..cdbbc02820 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1756,6 +1756,49 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_QuickFixEngineering( IWbemServices *services ) +{ + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; + static const WCHAR hotfixidW[] = + {'H','o','t','F','i','x','I','D',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count, total = 0; + VARIANT caption; + CIMTYPE type; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + VariantInit( &caption ); + hr = IWbemClassObject_Get( obj, captionW, 0, &caption, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &caption ) == VT_BSTR || V_VT( &caption ) == VT_NULL /* winxp */, + "unexpected variant type 0x%x\n", V_VT( &caption ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + + check_property( obj, hotfixidW, VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + if (total++ >= 10) break; + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1804,6 +1847,7 @@ START_TEST(query) test_Win32_Process( services, FALSE ); test_Win32_Process( services, TRUE ); test_Win32_Processor( services ); + test_Win32_QuickFixEngineering( services ); test_Win32_Service( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); -- 2.20.1

2 1

[PATCH 2/2 v2] msvcrt: Implement %R format for strftime
by Piotr Caban Sept. 30, 2019

Sept. 30, 2019

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 23 insertions(+)

2 1

[PATCH] scrrun: Add support for TristateUseDefault text stream format.
by Jacek Caban Sept. 30, 2019

Sept. 30, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 62 ++++++++++------- dlls/scrrun/tests/filesystem.c | 121 +++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 24 deletions(-)

2 1