December 2021 - Wine-devel - list.winehq.org

[PATCH v2 2/5] winevulkan: Pass Unix call arguments as a struct.
by Jacek Caban 10 Dec '21

10 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 31 +++- dlls/winevulkan/make_vulkan | 100 +++++++++---- dlls/winevulkan/vulkan.c | 285 +++++++++++++++++++++++++++--------- 3 files changed, 306 insertions(+), 110 deletions(-)

1 0

[PATCH 1/6] winevulkan: Use __wine_unix_call interface for Unix lib initialization.
by Jacek Caban 10 Dec '21

10 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch is interesting on its own. It bypasses syscall interface, but at least eliminates the need for __wine_init_unix_lib mechanism. Later patches use the interface in more places. We still can't call drivers from Unix stack. Since both mechanisms are supported in make_vulkan for now, it's easy to tweak needs_unix_call() if needed. dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 24 +++++++++++++++--------- dlls/winevulkan/make_vulkan | 12 ++++++++++++ dlls/winevulkan/vulkan.c | 29 +++++++++++------------------ dlls/winevulkan/vulkan_loader.h | 13 +++++++++++++ dlls/winevulkan/vulkan_private.h | 2 ++ 6 files changed, 54 insertions(+), 27 deletions(-)

2 2

[PATCH 1/2] win32u/tests: Add tests for NtUserEnumDisplayDevices return value.
by Torge Matthies 09 Dec '21

09 Dec '21

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/win32u/tests/win32u.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index a7c2e5ef029..7d1b7f3caa8 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -16,12 +16,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "ntuser.h" +static void test_NtUserEnumDisplayDevices(void) +{ + NTSTATUS ret; + DISPLAY_DEVICEW info; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); +} + static void test_NtUserCloseWindowStation(void) { BOOL ret; @@ -67,6 +88,7 @@ START_TEST(win32u) /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + test_NtUserEnumDisplayDevices(); /* Must run before test_NtUserCloseWindowStation. */ test_NtUserCloseWindowStation(); test_window_props(); } -- 2.34.1

2 2

[PATCH v4] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Bastien Orivel 09 Dec '21

09 Dec '21

According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..5ac88c47b2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,8 +2868,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..464a6e5c8ea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,59 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0

3 2

[PATCH 8/8] wined3d: Trace CS packet pointers.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Zebediah Figura <zfigura(a)codeweavers.com> This makes it easier to "unwind" through the CS thread when debugging. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2edaff01446..bb629d9b27f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3217,6 +3217,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined size_t packet_size; packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); @@ -3429,7 +3430,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; - TRACE("Executing %s.\n", debug_cs_op(opcode)); + TRACE("Executing %s at %p.\n", debug_cs_op(opcode), packet); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -3440,7 +3441,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) wined3d_cs_command_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); wined3d_cs_command_unlock(cs); - TRACE("%s executed.\n", debug_cs_op(opcode)); + TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } tail &= (WINED3D_CS_QUEUE_SIZE - 1); -- 2.30.2

1 0

[PATCH 7/8] Revert "wined3d: Acquire references to shaders in deferred contexts."
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> This reverts commit 908fb50728a33da6f7238cafcc8163065785ab0a. Moved to wined3d_cs_packet_{in/de}cref_objects(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 48 ---------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 49 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0bfe5e28822..2edaff01446 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -72,9 +72,6 @@ struct wined3d_command_list SIZE_T depth_stencil_state_count; struct wined3d_depth_stencil_state **depth_stencil_states; - - SIZE_T shader_count; - struct wined3d_shader **shaders; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -568,12 +565,6 @@ static inline void wined3d_device_context_acquire_depth_stencil_state(struct win context->ops->acquire_depth_stencil_state(context, depth_stencil_state); } -static inline void wined3d_device_context_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ - context->ops->acquire_shader(context, shader); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1795,8 +1786,6 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte op->type = type; op->shader = shader; - if (shader) - wined3d_device_context_acquire_shader(context, shader); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2974,11 +2963,6 @@ static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context { } -static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3219,7 +3203,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, - wined3d_cs_acquire_shader, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3350,7 +3333,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, - wined3d_cs_acquire_shader, }; static void poll_queries(struct wined3d_cs *cs) @@ -3651,9 +3633,6 @@ struct wined3d_deferred_context SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; struct wined3d_depth_stencil_state **depth_stencil_states; - - SIZE_T shader_count, shaders_capacity; - struct wined3d_shader **shaders; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3890,18 +3869,6 @@ static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_ wined3d_depth_stencil_state_incref(depth_stencil_state); } -static void wined3d_deferred_context_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->shaders, &deferred->shaders_capacity, - deferred->shader_count + 1, sizeof(*deferred->shaders))) - return; - - deferred->shaders[deferred->shader_count++] = shader; - wined3d_shader_incref(shader); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3917,7 +3884,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, - wined3d_deferred_context_acquire_shader, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3988,10 +3954,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); heap_free(deferred->depth_stencil_states); - for (i = 0; i < deferred->shader_count; ++i) - wined3d_shader_decref(deferred->shaders[i]); - heap_free(deferred->shaders); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -4020,7 +3982,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) - + deferred->shader_count * sizeof(*object->shaders) + deferred->data_size); if (!memory) @@ -4080,12 +4041,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); /* Transfer our references to the depth stencil states to the command list. */ - object->shaders = memory; - memory = &object->shaders[deferred->shader_count]; - object->shader_count = deferred->shader_count; - memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); - /* Transfer our references to the shaders to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4098,7 +4053,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; - deferred->shader_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4160,8 +4114,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); for (i = 0; i < list->depth_stencil_state_count; ++i) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); - for (i = 0; i < list->shader_count; ++i) - wined3d_shader_decref(list->shaders[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3805fdc48a7..71481a8c9c8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4853,7 +4853,6 @@ struct wined3d_device_context_ops struct wined3d_rasterizer_state *rasterizer_state); void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); - void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 6/8] wined3d: Acquire shader references for command lists by inspecting CS packets.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b1d39580d30..0bfe5e28822 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3574,6 +3574,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_SHADER: + { + struct wined3d_cs_set_shader *op = (struct wined3d_cs_set_shader *)packet->data; + + if (op->shader) + wined3d_shader_decref(op->shader); + break; + } + default: break; } @@ -3598,6 +3607,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_SHADER: + { + struct wined3d_cs_set_shader *op = (struct wined3d_cs_set_shader *)packet->data; + + if (op->shader) + wined3d_shader_incref(op->shader); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 5/8] Revert "wined3d: Acquire references to samplers in deferred contexts."
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> This reverts commit 0056ebf91ef3dd6a903e87adbdc1460bc08b4181. Sampler references in deferred contexts are now managed by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 55 ---------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 57 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ed7e3b2b630..b1d39580d30 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -75,9 +75,6 @@ struct wined3d_command_list SIZE_T shader_count; struct wined3d_shader **shaders; - - SIZE_T sampler_count; - struct wined3d_sampler **samplers; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -577,12 +574,6 @@ static inline void wined3d_device_context_acquire_shader(struct wined3d_device_c context->ops->acquire_shader(context, shader); } -static inline void wined3d_device_context_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ - context->ops->acquire_samplers(context, samplers, count); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1779,7 +1770,6 @@ void wined3d_device_context_emit_set_samplers(struct wined3d_device_context *con op->count = count; memcpy(op->samplers, samplers, count * sizeof(*samplers)); - wined3d_device_context_acquire_samplers(context, samplers, count); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2989,11 +2979,6 @@ static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, { } -static void wined3d_cs_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3235,7 +3220,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, - wined3d_cs_acquire_samplers, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3367,7 +3351,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, - wined3d_cs_acquire_samplers, }; static void poll_queries(struct wined3d_cs *cs) @@ -3653,9 +3636,6 @@ struct wined3d_deferred_context SIZE_T shader_count, shaders_capacity; struct wined3d_shader **shaders; - - SIZE_T sampler_count, samplers_capacity; - struct wined3d_sampler **samplers; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3904,26 +3884,6 @@ static void wined3d_deferred_context_acquire_shader(struct wined3d_device_contex wined3d_shader_incref(shader); } -static void wined3d_deferred_context_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - unsigned int i; - - if (!wined3d_array_reserve((void **)&deferred->samplers, &deferred->samplers_capacity, - deferred->sampler_count + count, sizeof(*deferred->samplers))) - return; - - for (i = 0; i < count; ++i) - { - if (samplers[i]) - { - deferred->samplers[deferred->sampler_count++] = samplers[i]; - wined3d_sampler_incref(samplers[i]); - } - } -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3940,7 +3900,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, wined3d_deferred_context_acquire_shader, - wined3d_deferred_context_acquire_samplers, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -4015,10 +3974,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_shader_decref(deferred->shaders[i]); heap_free(deferred->shaders); - for (i = 0; i < deferred->sampler_count; ++i) - wined3d_sampler_decref(deferred->samplers[i]); - heap_free(deferred->samplers); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -4048,7 +4003,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->shader_count * sizeof(*object->shaders) - + deferred->sampler_count * sizeof(*object->samplers) + deferred->data_size); if (!memory) @@ -4114,12 +4068,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); /* Transfer our references to the shaders to the command list. */ - object->samplers = memory; - memory = &object->samplers[deferred->sampler_count]; - object->sampler_count = deferred->sampler_count; - memcpy(object->samplers, deferred->samplers, deferred->sampler_count * sizeof(*object->samplers)); - /* Transfer our references to the samplers to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4133,7 +4081,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; deferred->shader_count = 0; - deferred->sampler_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4197,8 +4144,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); for (i = 0; i < list->shader_count; ++i) wined3d_shader_decref(list->shaders[i]); - for (i = 0; i < list->sampler_count; ++i) - wined3d_sampler_decref(list->samplers[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..3805fdc48a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4854,8 +4854,6 @@ struct wined3d_device_context_ops void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); - void (*acquire_samplers)(struct wined3d_device_context *context, struct wined3d_sampler * const *samplers, - unsigned int count); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 4/8] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Avoid some forward declarations. - Minor style changes. dlls/wined3d/cs.c | 76 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2889b3ec38c..ed7e3b2b630 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3572,6 +3572,54 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op = (struct wined3d_cs_set_samplers *)packet->data; + + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_decref(op->samplers[i]); + } + break; + } + + default: + break; + } +} + +static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op = (struct wined3d_cs_set_samplers *)packet->data; + + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_incref(op->samplers[i]); + } + break; + } + + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3634,16 +3682,18 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + wined3d_cs_packet_incref_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3925,7 +3975,8 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *context) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - SIZE_T i; + const struct wined3d_cs_packet *packet; + SIZE_T i, offset = 0; TRACE("context %p.\n", context); @@ -3968,6 +4019,12 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + while (offset < deferred->data_size) + { + packet = wined3d_next_cs_packet(deferred->data, &offset); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -4117,13 +4174,13 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); struct wined3d_device *device = list->device; + const struct wined3d_cs_packet *packet; + SIZE_T i, offset; TRACE("%p decreasing refcount to %u.\n", list, refcount); if (!refcount) { - SIZE_T i; - for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -4143,6 +4200,13 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + offset = 0; + while (offset < list->data_size) + { + packet = wined3d_next_cs_packet(list->data, &offset); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); -- 2.30.2

1 0

[PATCH 3/8] wined3d: Move the command list reference counting functions to the end of cs.c.
by Henri Verbeet 09 Dec '21

09 Dec '21

These are part of the public API, so there's not need for them to be at the start of the file. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- And in fact, it's somewhat counter-productive when we need to call local functions, as in the next patch in this series. dlls/wined3d/cs.c | 120 +++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index da32e1c2804..2889b3ec38c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -80,66 +80,6 @@ struct wined3d_command_list struct wined3d_sampler **samplers; }; -static void wined3d_command_list_destroy_object(void *object) -{ - struct wined3d_command_list *list = object; - SIZE_T i; - - TRACE("list %p.\n", list); - - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - - heap_free(list); -} - -ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) -{ - ULONG refcount = InterlockedIncrement(&list->refcount); - - TRACE("%p increasing refcount to %u.\n", list, refcount); - - return refcount; -} - -ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) -{ - ULONG refcount = InterlockedDecrement(&list->refcount); - struct wined3d_device *device = list->device; - - TRACE("%p decreasing refcount to %u.\n", list, refcount); - - if (!refcount) - { - SIZE_T i; - - for (i = 0; i < list->command_list_count; ++i) - wined3d_command_list_decref(list->command_lists[i]); - for (i = 0; i < list->resource_count; ++i) - wined3d_resource_decref(list->resources[i]); - for (i = 0; i < list->upload_count; ++i) - wined3d_resource_decref(list->uploads[i].resource); - for (i = 0; i < list->query_count; ++i) - wined3d_query_decref(list->queries[i].query); - for (i = 0; i < list->blend_state_count; ++i) - wined3d_blend_state_decref(list->blend_states[i]); - for (i = 0; i < list->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(list->rasterizer_states[i]); - for (i = 0; i < list->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); - for (i = 0; i < list->shader_count; ++i) - wined3d_shader_decref(list->shaders[i]); - for (i = 0; i < list->sampler_count; ++i) - wined3d_sampler_decref(list->samplers[i]); - - wined3d_mutex_lock(); - wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); - wined3d_mutex_unlock(); - } - - return refcount; -} - static void invalidate_client_address(struct wined3d_resource *resource) { struct wined3d_client_resource *client = &resource->client; @@ -4150,3 +4090,63 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device return S_OK; } + +static void wined3d_command_list_destroy_object(void *object) +{ + struct wined3d_command_list *list = object; + SIZE_T i; + + TRACE("list %p.\n", list); + + for (i = 0; i < list->upload_count; ++i) + heap_free(list->uploads[i].sysmem); + + heap_free(list); +} + +ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) +{ + ULONG refcount = InterlockedIncrement(&list->refcount); + + TRACE("%p increasing refcount to %u.\n", list, refcount); + + return refcount; +} + +ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) +{ + ULONG refcount = InterlockedDecrement(&list->refcount); + struct wined3d_device *device = list->device; + + TRACE("%p decreasing refcount to %u.\n", list, refcount); + + if (!refcount) + { + SIZE_T i; + + for (i = 0; i < list->command_list_count; ++i) + wined3d_command_list_decref(list->command_lists[i]); + for (i = 0; i < list->resource_count; ++i) + wined3d_resource_decref(list->resources[i]); + for (i = 0; i < list->upload_count; ++i) + wined3d_resource_decref(list->uploads[i].resource); + for (i = 0; i < list->query_count; ++i) + wined3d_query_decref(list->queries[i].query); + for (i = 0; i < list->blend_state_count; ++i) + wined3d_blend_state_decref(list->blend_states[i]); + for (i = 0; i < list->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(list->rasterizer_states[i]); + for (i = 0; i < list->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); + for (i = 0; i < list->shader_count; ++i) + wined3d_shader_decref(list->shaders[i]); + for (i = 0; i < list->sampler_count; ++i) + wined3d_sampler_decref(list->samplers[i]); + + wined3d_mutex_lock(); + wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); + wined3d_mutex_unlock(); + } + + return refcount; +} -- 2.30.2

1 0