March 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 01/10] vkd3d: Rework Vulkan queues initialisation.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 227 ++++++++++++++++++++++++++------------------ 1 file changed, 132 insertions(+), 95 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1de98f4a2ba..193a36cb2ee3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1097,6 +1097,25 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, return S_OK; } +/* Vulkan queues */ +enum vkd3d_queue_family +{ + VKD3D_QUEUE_FAMILY_DIRECT, + VKD3D_QUEUE_FAMILY_COMPUTE, + VKD3D_QUEUE_FAMILY_TRANSFER, + + VKD3D_QUEUE_FAMILY_COUNT, +}; + +struct vkd3d_device_queue_info +{ + unsigned int family_index[VKD3D_QUEUE_FAMILY_COUNT]; + VkQueueFamilyProperties vk_properties[VKD3D_QUEUE_FAMILY_COUNT]; + + unsigned int vk_family_count; + VkDeviceQueueCreateInfo vk_queue_create_info[VKD3D_QUEUE_FAMILY_COUNT]; +}; + static void d3d12_device_destroy_vkd3d_queues(struct d3d12_device *device) { if (device->direct_queue) @@ -1113,31 +1132,33 @@ static void d3d12_device_destroy_vkd3d_queues(struct d3d12_device *device) } static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, - const VkQueueFamilyProperties *queue_properties, uint32_t direct_queue_family_index, - uint32_t compute_queue_family_index, uint32_t copy_queue_family_index) + const struct vkd3d_device_queue_info *queue_info) { + uint32_t transfer_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER]; + uint32_t compute_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE]; + uint32_t direct_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; HRESULT hr; device->direct_queue = NULL; device->compute_queue = NULL; device->copy_queue = NULL; - if (FAILED((hr = vkd3d_queue_create(device, direct_queue_family_index, - &queue_properties[direct_queue_family_index], &device->direct_queue)))) + if (FAILED((hr = vkd3d_queue_create(device, direct_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT], &device->direct_queue)))) goto out_destroy_queues; - if (compute_queue_family_index == direct_queue_family_index) + if (compute_family_index == direct_family_index) device->compute_queue = device->direct_queue; - else if (FAILED(hr = vkd3d_queue_create(device, compute_queue_family_index, - &queue_properties[compute_queue_family_index], &device->compute_queue))) + else if (FAILED(hr = vkd3d_queue_create(device, compute_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE], &device->compute_queue))) goto out_destroy_queues; - if (copy_queue_family_index == direct_queue_family_index) + if (transfer_family_index == direct_family_index) device->copy_queue = device->direct_queue; - else if (copy_queue_family_index == compute_queue_family_index) + else if (transfer_family_index == compute_family_index) device->copy_queue = device->compute_queue; - else if (FAILED(hr = vkd3d_queue_create(device, copy_queue_family_index, - &queue_properties[copy_queue_family_index], &device->copy_queue))) + else if (FAILED(hr = vkd3d_queue_create(device, transfer_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER], &device->copy_queue))) goto out_destroy_queues; return S_OK; @@ -1147,100 +1168,126 @@ out_destroy_queues: return hr; } -static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, - const struct vkd3d_device_create_info *create_info) +static float queue_priorities[] = {1.0f}; + +static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, + VkPhysicalDevice physical_device, struct vkd3d_device_queue_info *info) { - unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; - const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; - VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; - struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + const struct vkd3d_vk_instance_procs *vk_procs = &vkd3d_instance->vk_procs; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; - VkPhysicalDeviceFeatures2 features2; - VkPhysicalDevice physical_device; - VkDeviceCreateInfo device_info; - uint32_t queue_family_count; - uint32_t extension_count; - const char **extensions; - VkDevice vk_device; unsigned int i; - VkResult vr; - HRESULT hr; - - TRACE("device %p, create_info %p.\n", device, create_info); - - physical_device = create_info->vk_physical_device; - if (!physical_device - && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) - return hr; + uint32_t count; - device->vk_physical_device = physical_device; + memset(info, 0, sizeof(*info)); + for (i = 0; i < ARRAY_SIZE(info->family_index); ++i) + info->family_index[i] = ~0u; - /* Create command queues */ - VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &queue_family_count, NULL)); - if (!(queue_properties = vkd3d_calloc(queue_family_count, sizeof(*queue_properties)))) + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, NULL)); + if (!(queue_properties = vkd3d_calloc(count, sizeof(*queue_properties)))) return E_OUTOFMEMORY; - VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, - &queue_family_count, queue_properties)); - - if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) - { - hr = E_OUTOFMEMORY; - goto done; - } + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, queue_properties)); - direct_queue_family_index = ~0u; - copy_queue_family_index = ~0u; - compute_queue_family_index = ~0u; - for (i = 0; i < queue_family_count; ++i) + for (i = 0; i < count; ++i) { - static float priorities[] = {1.0f}; - - queue_info[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; - queue_info[i].pNext = NULL; - queue_info[i].flags = 0; - queue_info[i].queueFamilyIndex = i; - queue_info[i].queueCount = 1; - queue_info[i].pQueuePriorities = priorities; + enum vkd3d_queue_family vkd3d_family = VKD3D_QUEUE_FAMILY_COUNT; if ((queue_properties[i].queueFlags & (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) == (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) { - direct_queue_family_index = i; - } - if (queue_properties[i].queueFlags & VK_QUEUE_TRANSFER_BIT) - { - copy_queue_family_index = i; + vkd3d_family = VKD3D_QUEUE_FAMILY_DIRECT; } if ((queue_properties[i].queueFlags & (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) == VK_QUEUE_COMPUTE_BIT) { - compute_queue_family_index = i; + vkd3d_family = VKD3D_QUEUE_FAMILY_COMPUTE; } + if ((queue_properties[i].queueFlags & ~VK_QUEUE_SPARSE_BINDING_BIT) == VK_QUEUE_TRANSFER_BIT) + { + vkd3d_family = VKD3D_QUEUE_FAMILY_TRANSFER; + } + + if (vkd3d_family == VKD3D_QUEUE_FAMILY_COUNT) + continue; + + info->family_index[vkd3d_family] = i; + info->vk_properties[vkd3d_family] = queue_properties[i]; + queue_info = &info->vk_queue_create_info[vkd3d_family]; + + queue_info->sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info->pNext = NULL; + queue_info->flags = 0; + queue_info->queueFamilyIndex = i; + queue_info->queueCount = 1; /* FIXME: Use multiple queues. */ + queue_info->pQueuePriorities = queue_priorities; } - if (direct_queue_family_index == ~0u) + vkd3d_free(queue_properties); + + if (info->family_index[VKD3D_QUEUE_FAMILY_DIRECT] == ~0u) { FIXME("Could not find a suitable queue family for a direct command queue.\n"); - hr = E_FAIL; - goto done; + return E_FAIL; } - if (copy_queue_family_index == ~0u) + + /* No compute-only queue family, reuse the direct queue family with graphics and compute. */ + if (info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE] == ~0u) { - FIXME("Could not find a suitable queue family for a copy command queue.\n"); - hr = E_FAIL; - goto done; + info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; } - if (compute_queue_family_index == ~0u) + if (info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] == ~0u) { - /* No compute-only queue family, reuse the direct queue family with graphics and compute. */ - compute_queue_family_index = direct_queue_family_index; + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; } - TRACE("Using queue family %u for direct command queues.\n", direct_queue_family_index); - TRACE("Using queue family %u for copy command queues.\n", copy_queue_family_index); - TRACE("Using queue family %u for compute command queues.\n", compute_queue_family_index); + /* Compact the array. */ + info->vk_family_count = 1; + for (i = info->vk_family_count; i < ARRAY_SIZE(info->vk_queue_create_info); ++i) + { + if (info->vk_queue_create_info[i].queueCount) + info->vk_queue_create_info[info->vk_family_count++] = info->vk_queue_create_info[i]; + } + + return S_OK; +} + +static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info) +{ + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + struct vkd3d_device_queue_info device_queue_info; + VkPhysicalDeviceFeatures2 features2; + VkPhysicalDevice physical_device; + VkDeviceCreateInfo device_info; + uint32_t extension_count; + const char **extensions; + VkDevice vk_device; + VkResult vr; + HRESULT hr; + + TRACE("device %p, create_info %p.\n", device, create_info); + + physical_device = create_info->vk_physical_device; + if (!physical_device + && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) + return hr; + + device->vk_physical_device = physical_device; + + if (FAILED(hr = vkd3d_select_queues(device->vkd3d_instance, physical_device, &device_queue_info))) + return hr; + + TRACE("Using queue family %u for direct command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_DIRECT]); + TRACE("Using queue family %u for compute command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_COMPUTE]); + TRACE("Using queue family %u for copy command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_TRANSFER]); VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); @@ -1257,20 +1304,17 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2, &extension_count))) - goto done; + return hr; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) - { - hr = E_OUTOFMEMORY; - goto done; - } + return E_OUTOFMEMORY; /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_info.pNext = &vertex_divisor_features; device_info.flags = 0; - device_info.queueCreateInfoCount = queue_family_count; - device_info.pQueueCreateInfos = queue_info; + device_info.queueCreateInfoCount = device_queue_info.vk_family_count; + device_info.pQueueCreateInfos = device_queue_info.vk_queue_create_info; device_info.enabledLayerCount = 0; device_info.ppEnabledLayerNames = NULL; device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, @@ -1286,8 +1330,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (vr < 0) { ERR("Failed to create Vulkan device, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto done; + return hresult_from_vk_result(vr); } if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) @@ -1295,26 +1338,20 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, ERR("Failed to load device procs, hr %#x.\n", hr); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto done; + return hr; } device->vk_device = vk_device; - if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, queue_properties, - direct_queue_family_index, compute_queue_family_index, copy_queue_family_index))) + if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, &device_queue_info))) { ERR("Failed to create queues, hr %#x.\n", hr); device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto done; + return hr; } TRACE("Created Vulkan device %p.\n", vk_device); -done: - if (queue_properties) - vkd3d_free(queue_properties); - if (queue_info) - vkd3d_free(queue_info); return hr; } -- 2.19.2

2 1

[PATCH v2] msacm32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc March 6, 2019

March 6, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: !pad->hDrvr is NULL on all path leading to gotError so remove that check too. dlls/msacm32/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..13187b2204 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,8 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) - HeapFree(MSACM_hHeap, 0, pad); + HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH 4/5] d3d9/tests: Add tests for Fetch4 with 3D textures.
by Henri Verbeet March 6, 2019

March 6, 2019

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f6b9211d84c..4b9b241b37d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15481,6 +15481,15 @@ static void test_fetch4(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + static const DWORD ps_code_3d[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0xa0000000, 0xa00f0800, /* dcl_volume s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0e40800, /* texld r0, v0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -15510,6 +15519,8 @@ static void test_fetch4(void) D3DCOLOR colour_amd[16]; D3DCOLOR colour_intel[16]; D3DCOLOR colour_fetch4_off[16]; + D3DCOLOR colour_3d_fetch4_off[16]; + D3DCOLOR colour_3d_amd_zround[16]; } expected_colours = { @@ -15532,6 +15543,16 @@ static void test_fetch4(void) 0x02020202, 0xf2f2f2f2, 0xf1f1f1f1, 0x01010101, 0x04040404, 0xf4f4f4f4, 0xf3f3f3f3, 0x03030303, 0x23232323, 0x22222222, 0x21212121, 0x20202020}, + /* Fetch4 off on 3D textures. */ + {0xff020202, 0xfff2f2f2, 0xfff1f1f1, 0xff010101, + 0xff050505, 0xfff4f4f4, 0xfff3f3f3, 0xff030303, + 0xff232323, 0xff222222, 0xff212121, 0xff202020, + 0xff131313, 0xff121212, 0xff111111, 0xff101010}, + /* Fetch4 on, 3D texture without nearest z rounding. */ + {0x02f204f4, 0xf2f1f4f3, 0xf101f303, 0x01010303, + 0x04f42322, 0xf4f32221, 0xf3032120, 0x03032020, + 0x23221312, 0x22211211, 0x21201110, 0x20201010, + 0x13121312, 0x12111211, 0x11101110, 0x10101010}, }; static const DWORD fetch4_data[] = {0x10111213, 0x01f1f202, 0x03f3f404, 0x20212223}; @@ -15618,15 +15639,18 @@ static void test_fetch4(void) }, }; - D3DCOLOR colour, colour_amd, colour_intel, colour_off; + D3DCOLOR colour, colour_amd, colour_intel, colour_off, colour_zround; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; + IDirect3DVolumeTexture9 *texture_3d; IDirect3DSurface9 *original_rt; + IDirect3DPixelShader9 *ps_3d; struct surface_readback rb; IDirect3DVertexShader9 *vs; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; unsigned int i, j, x, y; D3DLOCKED_RECT lr; + D3DLOCKED_BOX lb; IDirect3D9 *d3d; ULONG refcount; D3DCAPS9 caps; @@ -15681,6 +15705,8 @@ static void test_fetch4(void) hr = IDirect3DDevice9_CreatePixelShader(device, shaders[i].ps_code, &ps[i]); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_3d, &ps_3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE4(0)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -15818,12 +15844,70 @@ static void test_fetch4(void) IDirect3DTexture9_Release(tex); } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 2, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture_3d, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture_3d, 0, &lb, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(fetch4_data); ++i) + { + memcpy((BYTE *)lb.pBits + i * lb.RowPitch, &fetch4_data[i], sizeof(fetch4_data[i])); + /* Shift the lower level, to keep it different. */ + memcpy((BYTE *)lb.pBits + i * lb.RowPitch + lb.SlicePitch, &fetch4_data[(i + 1) % 4], sizeof(fetch4_data[i])); + } + hr = IDirect3DVolumeTexture9_UnlockBox(texture_3d, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture_3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Fetch4 with 3D textures. */ + for (i = 0; i < 2; ++i) + { + hr = IDirect3DDevice9_SetVertexShader(device, i ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, i ? ps_3d : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); + for (j = 0; j < ARRAY_SIZE(expected_colours.colour_amd); ++j) + { + x = expected_colours.x[j % 4]; + y = expected_colours.y[j / 4]; + colour_amd = expected_colours.colour_amd[j]; + colour_intel = expected_colours.colour_intel[j]; + colour_off = expected_colours.colour_3d_fetch4_off[j]; + colour_zround = expected_colours.colour_3d_amd_zround[j]; + colour = get_readback_color(&rb, x, y); + + /* Note: Fetch4 on 3D textures have different results based on the vendor/driver + * - AMD "HD 5700" rounds to nearest "z" texel, and does fetch4 normally on .xy + * - AMD "R500" has fetch4 disabled + * - AMD "R580" has fetch4 enabled sampling at .xy0 + * - Intel UHD 620 sample with fetch4 at .xy0 */ + ok(color_match(colour, colour_off, 2) || broken(color_match(colour, colour_zround, 2) + || color_match(colour, colour_intel, 2) || color_match(colour, colour_amd, 2)), + "Test 3D %s: Got unexpected colour 0x%08x at (%u, %u).\n", shaders[i].name, colour, x, y); + } + release_surface_readback(&rb); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + IDirect3DVolumeTexture9_Release(texture_3d); IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) { if (ps[i]) IDirect3DPixelShader9_Release(ps[i]); } + IDirect3DPixelShader9_Release(ps_3d); IDirect3DVertexShader9_Release(vs); IDirect3DSurface9_Release(original_rt); refcount = IDirect3DDevice9_Release(device); -- 2.11.0

2 1

[PATCH 3/5] d3d9/tests: Add tests for Fetch4 format support.
by Henri Verbeet March 6, 2019

March 6, 2019

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c62a94a8fb1..f6b9211d84c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15493,6 +15493,15 @@ static void test_fetch4(void) {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 4.0f, 2.0f}}, {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 4.0f, 2.0f}}, {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 4.0f, 2.0f}}, + }, + quad2[] = + { + /* Tilted on the z-axis to get a depth gradient in the depth test. */ + /* Note: Using 0.55f-0.6f to avoid rounding errors on depth tests. */ + {{-1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 0.6f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.6f, 0.0f}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.6f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.6f, 0.0f}}, }; static const struct @@ -15548,6 +15557,67 @@ static void test_fetch4(void) {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, }; + static const struct + { + const char *name; + D3DFORMAT format; + DWORD data; + unsigned int x, y; + unsigned int w, h; + D3DCOLOR colour_amd[3]; + D3DCOLOR colour_intel[3]; + BOOL todo; + } + format_tests[] = + { + /* Enabled formats */ + { + "L8", D3DFMT_L8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x40101040, 0x40101040, 0x40101040}, + }, + { + "L16", D3DFMT_L16, + 0xff804010, 360, 30, 2, 2, + {0xffff0000, 0xffff0000, 0x40ff0000}, + {0xff4040ff, 0xff4040ff, 0xff4040ff}, + }, + { + "R16F", D3DFMT_R16F, + 0x38003c00, 360, 30, 2, 2, + {0x80800000, 0x80800000, 0xff800000}, + {0x80ffff80, 0x80ffff80, 0x80ffff80}, + }, + { + "R32F", D3DFMT_R32F, + 0x3f000000, 360, 30, 2, 2, + {0x00000000, 0x00000000, 0x80000000}, + {0x00808000, 0x00808000, 0x00808000}, + }, + { + "ATI1", MAKEFOURCC('A','T','I','1'), + 0xb97700ff, 360, 30, 4, 4, + {0x6d6d6d6d, 0x6d6d6d6d, 0x49494949}, + {0xff6d00ff, 0xff6d00ff, 0xff4900ff}, + }, + /* Unsupported on Intel, broken in Wine. */ + { + "A8", D3DFMT_A8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x00000000, 0x00000000, 0x00000000}, + TRUE, + }, + /* Unsupported format. */ + { + "A8R8G8B8", D3DFMT_A8R8G8B8, + 0xff804010, 360, 270, 2, 2, + {0x00000000, 0x00000000, 0xff804010}, + {0x00000000, 0x00000000, 0xff804010}, + }, + }; + D3DCOLOR colour, colour_amd, colour_intel, colour_off; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; IDirect3DSurface9 *original_rt; @@ -15695,6 +15765,58 @@ static void test_fetch4(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Fetch4 format support. */ + for (i = 0; i < ARRAY_SIZE(format_tests); ++i) + { + IDirect3DTexture9 *tex; + + hr = IDirect3DDevice9_CreateTexture(device, format_tests[i].w, format_tests[i].h, + 1, 0, format_tests[i].format, D3DPOOL_MANAGED, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(tex, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(lr.pBits, &format_tests[i].data, 4); + hr = IDirect3DTexture9_UnlockRect(tex, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(format_tests[i].colour_amd); ++j) + { + hr = IDirect3DDevice9_SetVertexShader(device, ps[j] ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[j]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + colour_amd = format_tests[i].colour_amd[j]; + colour_intel = format_tests[i].colour_intel[j]; + colour = get_readback_color(&rb, format_tests[i].x, format_tests[i].y); + /* On windows just test the R channel, since G/B might be 0xff or 0x00. */ + todo_wine_if(format_tests[i].todo) + ok(color_match(colour, colour_amd, 2) || broken(color_match(colour, colour_intel, 2)) + || broken(color_match(colour & 0x00ff0000, colour_amd & 0x00ff0000, 2)), + "Test %s on %s: Got unexpected colour 0x%08x at (%u, %u).\n", + shaders[j].name, format_tests[i].name, colour, format_tests[i].x, format_tests[i].y); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + IDirect3DTexture9_Release(tex); + } IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) -- 2.11.0

2 1

[PATCH 2/5] d3d9/tests: Add texldd/texldb/texldl Fetch4 sampling tests.
by Henri Verbeet March 6, 2019

March 6, 2019

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This might have been more convincing if a texture with more than a single mip-level had been used. dlls/d3d9/tests/visual.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index adb04c14de1..c62a94a8fb1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15443,6 +15443,44 @@ static void test_fetch4(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + /* Fetch4 uses the same D3D state as LOD bias, and therefore disables LOD + * handling. Texldd/texldb/texldl give the same result as plain texld. */ + /* NOTE: The Radeon HD 5700 driver 8.17.10.1404 disables Fetch4 on these + * instructions. */ + static const DWORD ps_code_texldd[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, 0.5, 0.5 */ + 0x05000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 1.0, 1.0, 1.0 */ + 0x02000001, 0x800f0002, 0xa0e40000, /* mov r2, c0 */ + 0x0500005d, 0x800f0000, 0x90e40000, 0xa0e40800, 0xa0e40000, 0x80e40002, /* texldd r0, v0, s0, c0, r2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldb[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x40a00000, 0x40a00000, /* def c0, 0.0, 0.0, 5.0, 5.0 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x03020042, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldb r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldl[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x3f000000, 0x3f000000, /* def c0, 0.0, 0.0, 0.5, 0.5 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x0300005f, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldl r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -15503,6 +15541,9 @@ static void test_fetch4(void) {"texld", ps_code_texld, 0, FALSE, 0}, {"texldp", ps_code_texldp, 2, FALSE, 0}, {"texld_yzwx", ps_code_swizzle, 0, TRUE , 0}, + {"texldd", ps_code_texldd, 0, FALSE, 0}, + {"texldb", ps_code_texldb, 0, FALSE, 0}, + {"texldl", ps_code_texldl, 0, FALSE, 0}, {"FFP_proj", NULL, 2, FALSE, D3DTTFF_PROJECTED}, {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, }; -- 2.11.0

2 1

[PATCH 1/5] d3d9/tests: Add a basic Fetch4 sampling test.
by Henri Verbeet March 6, 2019

March 6, 2019

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 69cd4418bd2..adb04c14de1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15396,6 +15396,280 @@ done: DestroyWindow(window); } +static void test_fetch4(void) +{ + static const DWORD vs_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x80000005, 0xe00f0001, /* dcl_texcoord o1 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x02000001, 0xe00f0001, 0x90e40001, /* mov o1, v1 */ + 0x0000ffff, + }; + static const DWORD ps_code_texld[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0e40800, /* texld r0, v0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + /* AMD and Wine use the projection on Fetch4, Intel UHD ignores it. */ + static const DWORD ps_code_texldp[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + /* The idea here is that if we project from .z, we get a 4x zoom. From + * .w a 2x zoom. */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x40800000, 0x40000000, /* def c0, 0.0, 0.0, 4.0, 2.0 */ + 0x02000001, 0x80030000, 0x90f40000, /* mov r0.xy, v0.xyww */ + 0x02000001, 0x800c0000, 0xa0e00000, /* mov r0.zw, c0.xxzw */ + 0x03010042, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldp r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_swizzle[] = + { + /* Test texld when sampling with a .yzwx swizzle. */ + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0390800, /* texld r0, v0, s0.yzwx */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + + static const struct + { + struct vec3 position; + struct vec4 texcoord; + } + quad[] = + { + {{-1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 4.0f, 2.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 4.0f, 2.0f}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 4.0f, 2.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 4.0f, 2.0f}}, + }; + + static const struct + { + unsigned int x[4], y[4]; + D3DCOLOR colour_amd[16]; + D3DCOLOR colour_intel[16]; + D3DCOLOR colour_fetch4_off[16]; + } + expected_colours = + { + /* Sample positions. */ + {40, 200, 360, 520}, + {30, 150, 270, 390}, + /* AMD implementation (-0.5 texel offsets). */ + {0x131202f2, 0x1211f2f1, 0x1110f101, 0x10100101, + 0x02f204f4, 0xf2f1f4f3, 0xf101f303, 0x01010303, + 0x04f42322, 0xf4f32221, 0xf3032120, 0x03032020, + 0x23222322, 0x22212221, 0x21202120, 0x20202020}, + /* Intel UHD 620 implementation (no texel offsets). + * We treat the Intel results as broken. */ + {0x13131313, 0x12131312, 0x11121211, 0x10111110, + 0x13021302, 0x120213f2, 0x11f212f1, 0x10f11101, + 0x02040204, 0xf20402f4, 0xf1f4f2f3, 0x01f3f103, + 0x04230423, 0xf4230422, 0xf322f421, 0x0321f320}, + /* Fetch4 off on 2D textures. */ + {0x13131313, 0x12121212, 0x11111111, 0x10101010, + 0x02020202, 0xf2f2f2f2, 0xf1f1f1f1, 0x01010101, + 0x04040404, 0xf4f4f4f4, 0xf3f3f3f3, 0x03030303, + 0x23232323, 0x22222222, 0x21212121, 0x20202020}, + }; + + static const DWORD fetch4_data[] = {0x10111213, 0x01f1f202, 0x03f3f404, 0x20212223}; + + static const struct + { + const char *name; + const DWORD *ps_code; + unsigned int projection; + BOOL swizzled; + DWORD ttff_flags; + } + shaders[] = + { + {"FFP", NULL, 0, FALSE, 0}, + {"texld", ps_code_texld, 0, FALSE, 0}, + {"texldp", ps_code_texldp, 2, FALSE, 0}, + {"texld_yzwx", ps_code_swizzle, 0, TRUE , 0}, + {"FFP_proj", NULL, 2, FALSE, D3DTTFF_PROJECTED}, + {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, + }; + + D3DCOLOR colour, colour_amd, colour_intel, colour_off; + IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; + IDirect3DSurface9 *original_rt; + struct surface_readback rb; + IDirect3DVertexShader9 *vs; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + unsigned int i, j, x, y; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('D','F','2','4')))) + { + skip("No DF24 support, skipping Fetch4 test.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("No pixel shader 3.0 support, skipping FETCH4 test.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(fetch4_data); ++i) + memcpy((BYTE *)lr.pBits + i * lr.Pitch, &fetch4_data[i], sizeof(fetch4_data[i])); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(shaders); ++i) + { + if (!shaders[i].ps_code) + { + ps[i] = NULL; + continue; + } + + hr = IDirect3DDevice9_CreatePixelShader(device, shaders[i].ps_code, &ps[i]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE4(0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* According to the documentation, Fetch4 is enabled when + * D3DSAMP_MIPMAPLODBIAS == GET4 and D3DSAMP_MAGFILTER == D3DTEXF_POINT. + * In practice, it seems that only GET4 is required. + * + * AMD r500 hardware always uses POINT filtering with Fetch4. The driver + * later on corrected this by adding a -0.5 texel offset. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T','4')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Fetch4 should work with any texture wrapping mode, and does in Wine. + * However, AMD RX 580 devices force clamping when fetch4 is on. + * No other driver/hardware does this, but to avoid problems, we test with + * CLAMP on. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSW, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test basic Fetch4 sampling. */ + for (i = 0; i < ARRAY_SIZE(shaders); ++i) + { + hr = IDirect3DDevice9_SetVertexShader(device, ps[i] ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[i]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, shaders[i].ttff_flags); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + for (j = 0; j < ARRAY_SIZE(expected_colours.colour_amd); ++j) + { + unsigned int projection = shaders[i].projection; + + x = expected_colours.x[j % 4]; + y = expected_colours.y[j / 4]; + colour_amd = expected_colours.colour_amd[j]; + if (projection) + colour_amd = expected_colours.colour_amd[j / 4 / projection * 4 + (j % 4) / projection]; + if (shaders[i].swizzled) + colour_amd = (colour_amd << 8) | (colour_amd >> 24); + colour_intel = expected_colours.colour_intel[j]; + colour_off = expected_colours.colour_fetch4_off[j]; + colour = get_readback_color(&rb, x, y); + + ok(color_match(colour, colour_amd, 1) || broken(color_match(colour, colour_intel, 1)) + || broken(color_match(colour, colour_off, 1)), + "Test %s: Got unexpected colour 0x%08x at (%u, %u).\n", + shaders[i].name, colour, x, y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + IDirect3DTexture9_Release(texture); + for (i = 0; i < ARRAY_SIZE(ps); ++i) + { + if (ps[i]) + IDirect3DPixelShader9_Release(ps[i]); + } + IDirect3DVertexShader9_Release(vs); + IDirect3DSurface9_Release(original_rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void shadow_test(void) { static const DWORD ps_code[] = @@ -24895,6 +25169,7 @@ START_TEST(visual) depth_buffer2_test(); depth_blit_test(); intz_test(); + test_fetch4(); shadow_test(); fp_special_test(); depth_bounds_test(); -- 2.11.0

2 1

[PATCH 5/5] d3d9/tests: Add tests for Fetch4 with depth textures.
by Henri Verbeet March 6, 2019

March 6, 2019

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4b9b241b37d..61a67944a0a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15639,16 +15639,75 @@ static void test_fetch4(void) }, }; + static const struct + { + D3DCOLOR colour_off, colour_amd, colour_intel; + unsigned int x, y; + } + expected_depth[][4] = + { + { + /* Shadow samplers. */ + {0xffffffff, 0xffffffff, 0xffffffff, 20, 15}, + {0xffffffff, 0xffffffff, 0xffffffff, 260, 15}, + {0x00000000, 0x00000000, 0x00000000, 20, 255}, + {0x00000000, 0x00000000, 0x00000000, 260, 135}, + }, + { + /* DF16. */ + {0xfffe0000, 0xfedfdfbf, 0xffffffff, 20, 15}, + {0xff9f0000, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0xff800000, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0xff600000, 0x5f3f3f1f, 0x80809f60, 260, 135}, + }, + { + /* DF24. */ + {0xffff0000, 0xffdfdfbf, 0xffffffff, 20, 15}, + {0xff9f0000, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0xff800000, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0xff600000, 0x5f3f3f1f, 0x80809f60, 260, 135}, + }, + { + /* INTZ. */ + {0xffffffff, 0xffdfdfbf, 0xffffffff, 20, 15}, + {0x9f9f9f9f, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0x7f7f7f7f, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0x5f5f5f5f, 0x5f3f3f1f, 0x80809f60, 260, 135}, + } + }; + + static const struct + { + const char *name; + D3DFORMAT format; + unsigned int index; + } + depth_tests[] = + { + {"D16_LOCKABLE", D3DFMT_D16_LOCKABLE, 0}, + {"D32", D3DFMT_D32, 0}, + {"D15S1", D3DFMT_D15S1, 0}, + {"D24S8", D3DFMT_D24S8, 0}, + {"D24X8", D3DFMT_D24X8, 0}, + {"D24X4S4", D3DFMT_D24X4S4, 0}, + {"D16", D3DFMT_D16, 0}, + {"D32F_LOCKABLE", D3DFMT_D32F_LOCKABLE, 0}, + {"D24FS8", D3DFMT_D24FS8, 0}, + {"DF16", MAKEFOURCC('D','F','1','6'), 1}, + {"DF24", MAKEFOURCC('D','F','2','4'), 2}, + {"INTZ", MAKEFOURCC('I','N','T','Z'), 3}, + }; + D3DCOLOR colour, colour_amd, colour_intel, colour_off, colour_zround; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; IDirect3DVolumeTexture9 *texture_3d; - IDirect3DSurface9 *original_rt; + IDirect3DSurface9 *original_rt, *rt; IDirect3DPixelShader9 *ps_3d; struct surface_readback rb; IDirect3DVertexShader9 *vs; IDirect3DTexture9 *texture; + unsigned int i, j, k, x, y; IDirect3DDevice9 *device; - unsigned int i, j, x, y; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; @@ -15682,6 +15741,9 @@ static void test_fetch4(void) } hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 8, 8, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -15900,6 +15962,114 @@ static void test_fetch4(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + /* Test Fetch4 with depth textures. */ + for (i = 0; i < ARRAY_SIZE(depth_tests); ++i) + { + D3DFORMAT format = depth_tests[i].format; + IDirect3DTexture9 *depth_texture; + IDirect3DSurface9 *ds; + + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format))) + { + skip("Skipping %s depth test, unsupported format.\n", depth_tests[i].name); + continue; + } + + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, + D3DUSAGE_DEPTHSTENCIL, format, D3DPOOL_DEFAULT, &depth_texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(depth_texture, 0, &ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, + D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T','1')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Setup the depth/stencil surface. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Render to the depth surface. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)depth_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Set a shader for depth sampling, otherwise Windows does not show + * anything. */ + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[1]); /* texld */ + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < 2; ++j) + { + hr = IDirect3DDevice9_SetSamplerState(device, 0, + D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T', j ? '4' : '1' )); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Do the actual shadow mapping. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + for (k = 0; k < ARRAY_SIZE(expected_depth[depth_tests[i].index]); ++k) + { + x = expected_depth[depth_tests[i].index][k].x; + y = expected_depth[depth_tests[i].index][k].y; + colour_amd = expected_depth[depth_tests[i].index][k].colour_amd; + colour_intel = expected_depth[depth_tests[i].index][k].colour_intel; + colour_off = expected_depth[depth_tests[i].index][k].colour_off; + colour = get_readback_color(&rb, x, y); + + /* When Fetch4 is off, ignore the .g and .b channels on + * windows. Some implementations will replicate the .r channel + * to .g and .b, others will return 0 for .g and .b. */ + if (!j) + ok(color_match(colour, colour_off, 2) + || broken(color_match(colour & 0x00ff0000, colour_off & 0x00ff0000, 2)), + "Test off: Got unexpected colour 0x%08x for format %s at (%u, %u).\n", + colour, depth_tests[i].name, x, y); + else + ok(color_match(colour, colour_amd, 2) || broken(color_match(colour, colour_intel, 2)), + "Test on: Got unexpected colour 0x%08x for format %s at (%u, %u).\n", + colour, depth_tests[i].name, x, y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DTexture9_Release(depth_texture); + } + IDirect3DVolumeTexture9_Release(texture_3d); IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) @@ -15909,6 +16079,7 @@ static void test_fetch4(void) } IDirect3DPixelShader9_Release(ps_3d); IDirect3DVertexShader9_Release(vs); + IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(original_rt); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.11.0

1 0

[PATCH] mshtml: Don't store NSContainer in nsWineURI.
by Jacek Caban March 6, 2019

March 6, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 59 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-)

1 0

[PATCH] ntdll: Mark 'float_status' as input operand in save_fpu().
by Paul Gofman March 6, 2019

March 6, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f1deb1c65c..053c87da83 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -879,7 +879,7 @@ static inline void save_fpu( CONTEXT *context ) memcpy(&float_status, &context->FloatSave, sizeof(float_status)); float_status.StatusWord &= float_status.ControlWord | 0xffffff80; - __asm__ __volatile__( "fldenv %0" : "=m" (float_status) ); + __asm__ __volatile__( "fldenv %0" : : "m" (float_status) ); #endif } -- 2.20.1

1 0

[PATCH 1/5] mfplat: Fix potential invalid memory access (Coverity).
by Nikolay Sivov March 6, 2019

March 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 1b9ef38a4e..96dd6dec4d 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -185,6 +185,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) MFASYNC_WORKQUEUE_TYPE queue_type; struct queue_handle *entry; + *ret = NULL; + if (!system_queues[SYS_QUEUE_STANDARD].pool) return MF_E_SHUTDOWN; -- 2.20.1

2 6