- Wine-Devel - list.winehq.org

[PATCH] dinput: Wait for internal thread to compelte unacquiring.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

Otherwise we may close the read event before it has finished removing it from the wait handles, causing the internal thread wait to return an error and terminate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 13 ++++--------- dlls/dinput8/tests/hid.c | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 534e0ca8f86..12bc3a1f1dc 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1379,8 +1379,7 @@ static DWORD WINAPI hook_thread_proc(void *param) mouse_hook = NULL; } - if (finished_event) - SetEvent(finished_event); + SetEvent(finished_event); } } @@ -1502,17 +1501,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage ); } - if (acquired) - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); - if (acquired) - { - WaitForSingleObject(hook_change_finished_event, INFINITE); - CloseHandle(hook_change_finished_event); - } + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cd6ce5c425b..8242544f0f9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4759,9 +4759,6 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); @@ -7228,9 +7225,6 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); -- 2.33.0

2 1

[PATCH 1/3] dinput8/tests: Add some more polled read tests.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

Showing that we should probably not queue reports in this mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cdb19808fcd..7f933df3b06 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2174,6 +2174,40 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + value = 10; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &value, sizeof(ULONG), NULL, NULL ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + todo_wine + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } -- 2.33.0

1 2

[PATCH 1/7] wined3d: Don't call wined3d_texture_decref() in the CS thread.
by Jan Sikorski Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 217 ++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 117 insertions(+), 107 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eeb51448b01..31ca3fca853 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7947,7 +7947,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl context_gl->gl_info->gl_ops.gl.p_glFlush(); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adfbf60e726..c38aadac39e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13276,7 +13276,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli gl_info->gl_ops.gl.p_glFlush(); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a4ca4f5781..68238c7bed3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1219,7 +1219,7 @@ release: dst_texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(dst_texture->swapchain); } if (converted_texture) - wined3d_texture_decref(converted_texture); + wined3d_texture_destroy_temporary(converted_texture); context_release(context); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..608348a377a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -332,6 +332,116 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win return true; } +static void wined3d_texture_destroy_dc(void *object) +{ + const struct wined3d_texture_idx *idx = object; + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + struct wined3d_context *context; + struct wined3d_texture *texture; + struct wined3d_dc_info *dc_info; + struct wined3d_bo_address data; + unsigned int sub_resource_idx; + struct wined3d_device *device; + struct wined3d_range range; + NTSTATUS status; + + TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); + + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; + device = texture->resource.device; + dc_info = &texture->dc_info[sub_resource_idx]; + + if (!dc_info->dc) + { + ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); + return; + } + + TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); + + destroy_desc.hDc = dc_info->dc; + destroy_desc.hBitmap = dc_info->bitmap; + if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) + ERR("Failed to destroy dc, status %#x.\n", status); + dc_info->dc = NULL; + dc_info->bitmap = NULL; + + wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + if (data.buffer_object) + { + context = context_acquire(device, NULL, 0); + range.offset = 0; + range.size = texture->sub_resources[sub_resource_idx].size; + wined3d_context_unmap_bo_address(context, &data, 1, &range); + context_release(context); + } +} + +static void wined3d_texture_destroy_object(void *object) +{ + struct wined3d_texture *texture = object; + struct wined3d_resource *resource; + struct wined3d_dc_info *dc_info; + unsigned int sub_count; + unsigned int i; + + TRACE("texture %p.\n", texture); + + resource = &texture->resource; + sub_count = texture->level_count * texture->layer_count; + + if ((dc_info = texture->dc_info)) + { + for (i = 0; i < sub_count; ++i) + { + if (dc_info[i].dc) + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + wined3d_texture_destroy_dc(&texture_idx); + } + } + heap_free(dc_info); + } + + if (texture->overlay_info) + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_overlay_info *info = &texture->overlay_info[i]; + struct wined3d_overlay_info *overlay, *cur; + + list_remove(&info->entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) + { + list_remove(&overlay->entry); + } + } + heap_free(texture->overlay_info); + } + + if (texture->dirty_regions) + { + for (i = 0; i < texture->layer_count; ++i) + { + heap_free(texture->dirty_regions[i].boxes); + } + heap_free(texture->dirty_regions); + } + + resource->resource_ops->resource_unload(resource); +} + +void wined3d_texture_destroy_temporary(struct wined3d_texture *texture) +{ + assert(texture->resource.ref == 1); + wined3d_texture_destroy_object(texture); + wined3d_resource_free_sysmem(&texture->resource); + context_resource_released(texture->resource.device, &texture->resource); + heap_free(texture); +} + /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, @@ -571,10 +681,10 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont done: if (dst_texture != dst_save_texture) - wined3d_texture_decref(dst_texture); + wined3d_texture_destroy_temporary(dst_texture); if (src_staging_texture) - wined3d_texture_decref(src_staging_texture); + wined3d_texture_destroy_temporary(src_staging_texture); if (restore_texture) context_restore(context, restore_texture, restore_idx); @@ -1118,52 +1228,6 @@ static void wined3d_texture_create_dc(void *object) TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", dc_info->dc, dc_info->bitmap, texture, sub_resource_idx); } -static void wined3d_texture_destroy_dc(void *object) -{ - const struct wined3d_texture_idx *idx = object; - D3DKMT_DESTROYDCFROMMEMORY destroy_desc; - struct wined3d_context *context; - struct wined3d_texture *texture; - struct wined3d_dc_info *dc_info; - struct wined3d_bo_address data; - unsigned int sub_resource_idx; - struct wined3d_device *device; - struct wined3d_range range; - NTSTATUS status; - - TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); - - texture = idx->texture; - sub_resource_idx = idx->sub_resource_idx; - device = texture->resource.device; - dc_info = &texture->dc_info[sub_resource_idx]; - - if (!dc_info->dc) - { - ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); - return; - } - - TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); - - destroy_desc.hDc = dc_info->dc; - destroy_desc.hBitmap = dc_info->bitmap; - if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) - ERR("Failed to destroy dc, status %#x.\n", status); - dc_info->dc = NULL; - dc_info->bitmap = NULL; - - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - if (data.buffer_object) - { - context = context_acquire(device, NULL, 0); - range.offset = 0; - range.size = texture->sub_resources[sub_resource_idx].size; - wined3d_context_unmap_bo_address(context, &data, 1, &range); - context_release(context); - } -} - void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) { texture->swapchain = swapchain; @@ -1453,61 +1517,6 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } -static void wined3d_texture_destroy_object(void *object) -{ - struct wined3d_texture *texture = object; - struct wined3d_resource *resource; - struct wined3d_dc_info *dc_info; - unsigned int sub_count; - unsigned int i; - - TRACE("texture %p.\n", texture); - - resource = &texture->resource; - sub_count = texture->level_count * texture->layer_count; - - if ((dc_info = texture->dc_info)) - { - for (i = 0; i < sub_count; ++i) - { - if (dc_info[i].dc) - { - struct wined3d_texture_idx texture_idx = {texture, i}; - - wined3d_texture_destroy_dc(&texture_idx); - } - } - heap_free(dc_info); - } - - if (texture->overlay_info) - { - for (i = 0; i < sub_count; ++i) - { - struct wined3d_overlay_info *info = &texture->overlay_info[i]; - struct wined3d_overlay_info *overlay, *cur; - - list_remove(&info->entry); - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) - { - list_remove(&overlay->entry); - } - } - heap_free(texture->overlay_info); - } - - if (texture->dirty_regions) - { - for (i = 0; i < texture->layer_count; ++i) - { - heap_free(texture->dirty_regions[i].boxes); - } - heap_free(texture->dirty_regions); - } - - resource->resource_ops->resource_unload(resource); -} - void wined3d_texture_cleanup(struct wined3d_texture *texture) { wined3d_cs_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); @@ -5961,7 +5970,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit (old_colour_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..fe7a8dff55e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4462,6 +4462,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_texture_destroy_temporary(struct wined3d_texture *texture) DECLSPEC_HIDDEN; HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, -- 2.30.2

4 19

[PATCH 1/3] maintainers: Add hidparse.sys under HID support.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..f4bdae8842b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -143,6 +143,7 @@ M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/hidparse.sys/ F: dlls/winehid.sys/ HTTP server -- 2.33.0

1 2

[PATCH] hidparse.sys: Ignore unknown item types, rather than failing.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

Some DS4 controllers have a trailing NUL byte when accessed over bluetooth. This causes parse_descriptor to return an error where we can instead ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 18ee23974f0..d455049d9b1 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -628,7 +628,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng default: FIXME( "item type %x not implemented!\n", *ptr ); - goto done; + break; } #undef SHORT_ITEM } -- 2.33.0

1 0

[PATCH] winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

These contain the bluetooth dongle VID / PID instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c56273a6b23..2f85c86694c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1103,12 +1103,12 @@ static const struct hid_device_vtbl lnxev_device_vtbl = }; #endif /* HAS_PROPER_INPUT_HEADER */ -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc, + int *bus) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[MAX_PATH]; - DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1139,16 +1139,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || desc->vid || desc->pid) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); + if (*bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", bus, &desc->vid, &desc->pid); } - if (!strncmp(ptr, "PRODUCT=", 8)) + if (!strncmp(ptr, "PRODUCT=", 8) && *bus != BUS_BLUETOOTH) { if (desc->version) continue; if (!strcmp(subsystem, "usb")) sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", bus, &desc->vid, &desc->pid, &desc->version); } } } @@ -1172,7 +1172,7 @@ static void udev_add_device(struct udev_device *dev) struct base_device *impl; const char *subsystem; const char *devnode; - int fd; + int fd, bus = 0; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1194,9 +1194,9 @@ static void udev_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &desc); - get_device_subsystem_info(dev, "input", &desc); - get_device_subsystem_info(dev, "usb", &desc); + get_device_subsystem_info(dev, "hid", &desc, &bus); + get_device_subsystem_info(dev, "input", &desc, &bus); + get_device_subsystem_info(dev, "usb", &desc, &bus); subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw")) -- 2.33.0

1 0

[PATCH] dinput: Only dump the HID report data that has been read.
by Rémi Bernon Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ef082ca1282..0661affecbc 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1629,14 +1629,14 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (ret && TRACE_ON(dinput)) { TRACE( "read size %u report:\n", count ); - for (i = 0; i < report_len;) + for (i = 0; i < count;) { char buffer[256], *buf = buffer; buf += sprintf(buf, "%08x ", i); do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < report_len); + } while (++i % 16 && i < count); TRACE("%s\n", buffer); } } -- 2.33.0

1 0

[PATCH 0/3] Remove ancient codepaths
by Emil Velikov Oct. 12, 2021

Oct. 12, 2021

Hey everyone, Here's a small series which removes compatibility glue for ancient distros. In particular - we bump to using 16 year old libxslt and 5 year old gnutls. Amazing "update" right :-) Joking aside, these are covered by all supported distros, including the distro packages linked on the winehq.org site. Any questions or comments, do let me know Emil Emil Velikov (3): msxml3: remove workaround for libxslt =< 1.1.14 bcrypt: bump gnutls version to 3.5.0 secur32: remove gnutls < 3.5.0 defines dlls/bcrypt/gnutls.c | 189 ++++++--------------------------- dlls/msxml3/main.c | 38 ++++--- dlls/secur32/schannel_gnutls.c | 17 --- 3 files changed, 52 insertions(+), 192 deletions(-) -- 2.33.0

2 6

[PATCH vkd3d v2 1/2] tests: Add tests for 5-bit masking of shader bit shift operands.
by Conor McCarthy Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Also test immediate constants. --- tests/d3d12.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 70f73b79..a393401c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8598,15 +8598,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9927,6 +9928,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}}, -- 2.32.0

1 1

[PATCH vkd3d 1/9] tests: Add tests for sample_c texel offset.
by Conor McCarthy Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 106 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 30 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..09cc0e98 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14417,11 +14417,11 @@ static void test_gather_c(void) static void test_sample_c_lz(void) { + struct depth_stencil_resource ds, ds_offset; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D12GraphicsCommandList *command_list; D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; - struct depth_stencil_resource ds; struct test_context_desc desc; struct resource_readback rb; struct test_context context; @@ -14429,7 +14429,7 @@ static void test_sample_c_lz(void) ID3D12CommandQueue *queue; struct vec4 ps_constant; ID3D12Device *device; - unsigned int i; + unsigned int i, j; RECT rect; static const D3D12_STATIC_SAMPLER_DESC sampler_desc = @@ -14472,6 +14472,36 @@ static void test_sample_c_lz(void) 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_array = {ps_array_code, sizeof(ps_array_code)}; + static const DWORD ps_array_offset_code[] = + { +#if 0 + Texture2DArray t; + SamplerComparisonState s; + + float ref; + float layer; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.SampleCmpLevelZero(s, float3(position.x / 5120.0f, position.y / 3840.0f, layer), ref, + int2(4, 4)); + } +#endif + 0x43425844, 0xdf99ade1, 0x420d8d11, 0x3abe4b31, 0x116badd9, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f0, 0x00000050, + 0x0000003c, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000, + 0x00000000, 0x04004058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x394ccccd, 0x39888889, 0x00000000, 0x00000000, + 0x06000036, 0x00100042, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x8f000047, 0x80008801, + 0x80000202, 0x00155543, 0x00100012, 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, + 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_array_offset = {ps_array_offset_code, sizeof(ps_array_offset_code)}; static const DWORD ps_cube_code[] = { #if 0 @@ -14590,15 +14620,15 @@ static void test_sample_c_lz(void) heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); - /* 2D array texture */ - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, NULL, &ps_array, NULL); - init_depth_stencil(&ds, device, 32, 32, ARRAY_SIZE(depth_values), 2, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); + init_depth_stencil(&ds_offset, device, 32, 32, ARRAY_SIZE(depth_values), 2, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); for (i = 0; i < ARRAY_SIZE(depth_values); ++i) { + static const D3D12_RECT rects[] = {{0, 0, 3, 3}, {3, 3, 32, 32}}; + memset(&dsv_desc, 0, sizeof(dsv_desc)); dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY; @@ -14607,6 +14637,11 @@ static void test_sample_c_lz(void) ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL); + ID3D12Device_CreateDepthStencilView(device, ds_offset.texture, &dsv_desc, ds_offset.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 1, &rects[0]); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 1, &rects[1]); dsv_desc.Texture2DArray.MipSlice = 1; ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); @@ -14623,44 +14658,54 @@ static void test_sample_c_lz(void) srv_desc.Texture2DArray.FirstArraySlice = 0; srv_desc.Texture2DArray.ArraySize = ARRAY_SIZE(depth_values); ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &srv_desc, cpu_handle); + ID3D12Device_CreateShaderResourceView(context.device, ds_offset.texture, &srv_desc, + get_cpu_descriptor_handle(&context, heap, 1)); transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); memset(&ps_constant, 0, sizeof(ps_constant)); - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (j = 0; j < 2; ++j) { - vkd3d_test_set_context("test %u", i); + /* 2D array texture */ + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, + j ? &ps_array_offset : &ps_array, NULL); - ps_constant.x = tests[i].d_ref; - ps_constant.y = tests[i].layer; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("test %u%s", i, j ? " offset" : ""); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, - get_gpu_descriptor_handle(&context, heap, 0)); - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ps_constant.x = tests[i].d_ref; + ps_constant.y = tests[i].layer; - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, j)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - reset_command_list(command_list, context.allocator); - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + todo_if(j && tests[i].d_ref > 0.0f) + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + ID3D12PipelineState_Release(context.pipeline_state); } vkd3d_test_set_context(NULL); - ID3D12PipelineState_Release(context.pipeline_state); - /* cube texture */ context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, NULL, &ps_cube, NULL); @@ -14709,6 +14754,7 @@ static void test_sample_c_lz(void) vkd3d_test_set_context(NULL); destroy_depth_stencil(&ds); + destroy_depth_stencil(&ds_offset); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); } -- 2.32.0

2 10