- Wine-Devel - list.winehq.org

[RFC PATCH v4 0/5] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach
by Jinoh Kang Feb. 4, 2022

Feb. 4, 2022

<preamble> This is my forth attempt to tackle the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Basically, the old process of sock_recv is: 1. Perform the I/O synchronously. 2. Report the result back to the server, or queue up the request in the server. 3. If blocking, wait for I/O to complete. The new process of sock_recv would be: 1. Queue up the request in the server. 2. Perform the I/O synchronously. 3. Report the result back to the server, 4. If blocking, wait for I/O to complete. Everything except the actual I/O requires communicating with wineserver. My goal here is to fix the issue without introducing extra calls to wineserver. (However, if it turns out that this goal is not of utmost significance, then this patch serie can be easily modified so that it issues separate server calls.) The previous approaches are listed here: - Add a new select type called SELECT_SIGNAL_WAIT_ASYNC [3]. Zebediah has pointed out [4] that it is not very elegant to (ab-)use the synchronization machinery for communicating the async result. - Use APC_ASYNC_IO to perform the synchronous I/O [5]. This ended up with a total of 11 patches, and turned out to be rather too complicated for a simple task. - Add a new wineserver call, and use "add_queue" hook to save a round trip to the server [6]. </preamble> Each of the above turned out to be either too intrusive, complicated, or hard to verify. Per suggestion by Zebediah [7], this is my (hopefully) last approach: keep the new wineserver call, but keep out the implicit STATUS_PENDING transition from "add_queue"; also, (re-)use the "unknown_status" field. Changelog: - v1 -> v2: fix async queue hang on synchronous failure - v2 -> v3: rewrite handling of pending/failed asyncs. - v3 -> v4: don't set IOSB on synchronous failure, make more robust [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html [3] https://www.winehq.org/pipermail/wine-devel/2022-January/204695.html [4] https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html [5] https://www.winehq.org/pipermail/wine-devel/2022-January/205168.html [6] https://www.winehq.org/pipermail/wine-devel/2022-January/205193.html [7] https://www.winehq.org/pipermail/wine-devel/2022-January/205738.html Jinoh Kang (5): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a new server request "notify_async_direct_result." server: Attempt to complete I/O request immediately in recv_socket. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 37 ++++++++------- dlls/ntdll/unix/sync.c | 22 +++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ws2_32/tests/sock.c | 8 ++-- server/async.c | 86 ++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++- server/sock.c | 40 +++++++++++----- 7 files changed, 173 insertions(+), 35 deletions(-) -- 2.34.1

2 20

[PATCH 1/4] d2d1/tests: Don't run the 32-bit tests multithreaded.
by Zebediah Figura Feb. 4, 2022

Feb. 4, 2022

This works fine currently, but won't once we start suballocating GL buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This is a bit of a sledgehammer solution (and actually d2d1 and d3d10core at least seem to be fine with just limiting the thread count to 4). We could instead use separate processes, but it doesn't seem particularly worthwhile to write that code when we might end up being limited by VRAM anyway. dlls/d2d1/tests/d2d1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6bc6a99274c..d0fee842ed5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -161,7 +161,9 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx; - if (!use_mt) + /* Running the tests multithreaded on 32-bit maps too much memory in Wine, + * even with only 2 threads. */ + if (!use_mt || sizeof(void *) == 4) { for (i = 0; i < mt_test_count; ++i) { -- 2.34.1

3 8

[PATCH 1/3] opencl: Rename cl_{enums,types} to header_{enums,types}.
by Zebediah Figura Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/opencl/make_opencl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 088120c8081..a93946b2d2b 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -297,8 +297,8 @@ sub generate_spec_entry($$) } my %core_functions; -my %cl_enums; -my (%cl_types, @cl_types); # also use an array to preserve declaration order +my %header_enums; +my (%header_types, @header_types); # also use an array to preserve declaration order # some functions need a hand-written wrapper sub needs_pe_wrapper($) @@ -440,13 +440,13 @@ sub parse_file($) } foreach my $enum ($feature->findnodes("./require/enum")) { - $cl_enums{$enum->{name}} = $enums{$enum->{name}}; + $header_enums{$enum->{name}} = $enums{$enum->{name}}; } foreach my $type ($feature->findnodes("./require/type")) { next unless $types{$type->{name}}; - push @cl_types, $type->{name} unless $cl_types{$type->{name}}; - $cl_types{$type->{name}} = $types{$type->{name}}; + push @header_types, $type->{name} unless $header_types{$type->{name}}; + $header_types{$type->{name}} = $types{$type->{name}}; } } @@ -588,9 +588,9 @@ typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; END ; -foreach (@cl_types) +foreach (@header_types) { - my $type = $cl_types{$_}; + my $type = $header_types{$_}; if ($type->{category} eq "define") { print TYPES $type->textContent() . "\n"; @@ -603,9 +603,9 @@ foreach (@cl_types) print TYPES "\n"; -foreach (sort keys %cl_enums) +foreach (sort keys %header_enums) { - printf TYPES "#define %s %s\n", $_, $cl_enums{$_}; + printf TYPES "#define %s %s\n", $_, $header_enums{$_}; } close(TYPES); -- 2.34.1

3 4

How to get GM.DLS working
by Augustus Wong Feb. 4, 2022

Feb. 4, 2022

I have a question How do I get GM.DLS working my current setup is Linux Mint 2.0.3 and Wine 7.0 GM.DLS is already in .wine/drive_c/windows/system32/drivers but it doesn't work so whats wrong and why doesn't it work I would like help

2 1

[PATCH vkd3d 3/3] vkd3d-utils: Implement the event functions for Windows.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 37 ++++++++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 8 ------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9c968cc65334..7fb042cc3cbc 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -327,6 +327,41 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename } /* Events */ + +#ifdef _WIN32 + +HANDLE vkd3d_create_event(void) +{ + return CreateEventA(NULL, FALSE, FALSE, NULL); +} + +HRESULT vkd3d_signal_event(HANDLE event) +{ + SetEvent(event); + return S_OK; +} + +unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) +{ + return WaitForSingleObject(event, milliseconds); +} + +void vkd3d_destroy_event(HANDLE event) +{ + CloseHandle(event); +} + +#else /* _WIN32 */ + +#include <pthread.h> + +struct vkd3d_event +{ + pthread_mutex_t mutex; + pthread_cond_t cond; + BOOL is_signaled; +}; + HANDLE vkd3d_create_event(void) { struct vkd3d_event *event; @@ -434,6 +469,8 @@ void vkd3d_destroy_event(HANDLE event) vkd3d_free(impl); } +#endif /* _WIN32 */ + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob) { HRESULT hr; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 06ac7e6bbfa2..1b8254b67b1a 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -23,7 +23,6 @@ #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#include <pthread.h> #include <vkd3d.h> #include <vkd3d_shader.h> #include <vkd3d_d3dcompiler.h> @@ -32,11 +31,4 @@ #include "vkd3d_memory.h" #include <vkd3d_utils.h> -struct vkd3d_event -{ - pthread_mutex_t mutex; - pthread_cond_t cond; - BOOL is_signaled; -}; - #endif /* __VKD3D_UTILS_PRIVATE_H */ -- 2.34.1

2 1

[PATCH vkd3d 2/3] vkd3d: Implement the synchronization wrappers for Windows.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_private.h | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bb7be99e7efc..ece111325e77 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -23,6 +23,10 @@ #define NONAMELESSUNION #define VK_NO_PROTOTYPES +#ifdef _WIN32 +# define _WIN32_WINNT 0x0600 /* for condition variables */ +#endif + #include "vkd3d_common.h" #include "vkd3d_blob.h" #include "vkd3d_memory.h" @@ -171,6 +175,72 @@ union vkd3d_thread_handle void *handle; }; +#ifdef _WIN32 + +struct vkd3d_mutex +{ + CRITICAL_SECTION lock; +}; + +struct vkd3d_cond +{ + CONDITION_VARIABLE cond; +}; + +static inline int vkd3d_mutex_init(struct vkd3d_mutex *lock) +{ + InitializeCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_lock(struct vkd3d_mutex *lock) +{ + EnterCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_unlock(struct vkd3d_mutex *lock) +{ + LeaveCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_destroy(struct vkd3d_mutex *lock) +{ + DeleteCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_cond_init(struct vkd3d_cond *cond) +{ + InitializeConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_signal(struct vkd3d_cond *cond) +{ + WakeConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_broadcast(struct vkd3d_cond *cond) +{ + WakeAllConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) +{ + return !SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE); +} + +static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) +{ + return 0; +} + +#else /* _WIN32 */ + struct vkd3d_mutex { pthread_mutex_t lock; @@ -227,6 +297,8 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) return pthread_cond_destroy(&cond->cond); } +#endif /* _WIN32 */ + HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread); -- 2.34.1

2 1

[PATCH vkd3d 1/3] vkd3d: Add inline wrappers for the pthread synchronization functions.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 134 ++++++++++++++++++------------------- libs/vkd3d/device.c | 52 +++++++------- libs/vkd3d/resource.c | 28 ++++---- libs/vkd3d/state.c | 12 ++-- libs/vkd3d/utils.c | 12 ++-- libs/vkd3d/vkd3d_private.h | 86 +++++++++++++++++++----- 6 files changed, 190 insertions(+), 134 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f1ec6be3fd20..61e18105ee12 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -32,7 +32,7 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if ((rc = pthread_mutex_init(&object->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&object->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); vkd3d_free(object); @@ -67,7 +67,7 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) unsigned int i; int rc; - if ((rc = pthread_mutex_lock(&queue->mutex))) + if ((rc = vkd3d_mutex_lock(&queue->mutex))) ERR("Failed to lock mutex, error %d.\n", rc); for (i = 0; i < queue->semaphore_count; ++i) @@ -82,9 +82,9 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) } if (!rc) - pthread_mutex_unlock(&queue->mutex); + vkd3d_mutex_unlock(&queue->mutex); - pthread_mutex_destroy(&queue->mutex); + vkd3d_mutex_destroy(&queue->mutex); vkd3d_free(queue); } @@ -94,7 +94,7 @@ VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) TRACE("queue %p.\n", queue); - if ((rc = pthread_mutex_lock(&queue->mutex))) + if ((rc = vkd3d_mutex_lock(&queue->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return VK_NULL_HANDLE; @@ -108,7 +108,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) { TRACE("queue %p.\n", queue); - pthread_mutex_unlock(&queue->mutex); + vkd3d_mutex_unlock(&queue->mutex); } static VkResult vkd3d_queue_wait_idle(struct vkd3d_queue *queue, @@ -144,7 +144,7 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, unsigned int i, j; int rc; - if ((rc = pthread_mutex_lock(&queue->mutex))) + if ((rc = vkd3d_mutex_lock(&queue->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -189,7 +189,7 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, if (destroyed_semaphore_count) TRACE("Destroyed %u Vulkan semaphores.\n", destroyed_semaphore_count); - pthread_mutex_unlock(&queue->mutex); + vkd3d_mutex_unlock(&queue->mutex); } static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *queue) @@ -253,7 +253,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value); - if ((rc = pthread_mutex_lock(&worker->mutex))) + if ((rc = vkd3d_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -263,7 +263,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences))) { ERR("Failed to add GPU fence.\n"); - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); return E_OUTOFMEMORY; } @@ -277,8 +277,8 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, InterlockedIncrement(&fence->pending_worker_operation_count); - pthread_cond_signal(&worker->cond); - pthread_mutex_unlock(&worker->mutex); + vkd3d_cond_signal(&worker->cond); + vkd3d_mutex_unlock(&worker->mutex); return S_OK; } @@ -293,7 +293,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); - if ((rc = pthread_mutex_lock(&worker->mutex))) + if ((rc = vkd3d_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -304,14 +304,14 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); worker->pending_fence_destruction = true; - pthread_cond_signal(&worker->cond); + vkd3d_cond_signal(&worker->cond); - pthread_cond_wait(&worker->fence_destruction_cond, &worker->mutex); + vkd3d_cond_wait(&worker->fence_destruction_cond, &worker->mutex); } TRACE("Removed fence %p.\n", fence); - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); } static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker) @@ -412,7 +412,7 @@ static void *vkd3d_fence_worker_main(void *arg) if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { - if ((rc = pthread_mutex_lock(&worker->mutex))) + if ((rc = vkd3d_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); break; @@ -420,7 +420,7 @@ static void *vkd3d_fence_worker_main(void *arg) if (worker->pending_fence_destruction) { - pthread_cond_broadcast(&worker->fence_destruction_cond); + vkd3d_cond_broadcast(&worker->fence_destruction_cond); worker->pending_fence_destruction = false; } @@ -432,19 +432,19 @@ static void *vkd3d_fence_worker_main(void *arg) { if (worker->should_exit) { - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); break; } - if ((rc = pthread_cond_wait(&worker->cond, &worker->mutex))) + if ((rc = vkd3d_cond_wait(&worker->cond, &worker->mutex))) { ERR("Failed to wait on condition variable, error %d.\n", rc); - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); break; } } - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); } } @@ -474,33 +474,33 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, worker->fences = NULL; worker->fences_size = 0; - if ((rc = pthread_mutex_init(&worker->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&worker->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); } - if ((rc = pthread_cond_init(&worker->cond, NULL))) + if ((rc = vkd3d_cond_init(&worker->cond))) { ERR("Failed to initialize condition variable, error %d.\n", rc); - pthread_mutex_destroy(&worker->mutex); + vkd3d_mutex_destroy(&worker->mutex); return hresult_from_errno(rc); } - if ((rc = pthread_cond_init(&worker->fence_destruction_cond, NULL))) + if ((rc = vkd3d_cond_init(&worker->fence_destruction_cond))) { ERR("Failed to initialize condition variable, error %d.\n", rc); - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); + vkd3d_mutex_destroy(&worker->mutex); + vkd3d_cond_destroy(&worker->cond); return hresult_from_errno(rc); } if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, vkd3d_fence_worker_main, worker, &worker->thread))) { - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - pthread_cond_destroy(&worker->fence_destruction_cond); + vkd3d_mutex_destroy(&worker->mutex); + vkd3d_cond_destroy(&worker->cond); + vkd3d_cond_destroy(&worker->fence_destruction_cond); } return hr; @@ -514,23 +514,23 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, TRACE("worker %p.\n", worker); - if ((rc = pthread_mutex_lock(&worker->mutex))) + if ((rc = vkd3d_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); } worker->should_exit = true; - pthread_cond_signal(&worker->cond); + vkd3d_cond_signal(&worker->cond); - pthread_mutex_unlock(&worker->mutex); + vkd3d_mutex_unlock(&worker->mutex); if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread))) return hr; - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - pthread_cond_destroy(&worker->fence_destruction_cond); + vkd3d_mutex_destroy(&worker->mutex); + vkd3d_cond_destroy(&worker->cond); + vkd3d_cond_destroy(&worker->fence_destruction_cond); vkd3d_free(worker->enqueued_fences); vkd3d_free(worker->vk_fences); @@ -589,7 +589,7 @@ static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence * *vk_fence = VK_NULL_HANDLE; - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); goto create_fence; @@ -604,7 +604,7 @@ static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence * } } - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); if (*vk_fence) return VK_SUCCESS; @@ -668,7 +668,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) unsigned int i; int rc; - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -685,7 +685,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true); - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); } static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct d3d12_fence *fence, @@ -698,7 +698,7 @@ static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct TRACE("fence %p, value %#"PRIx64".\n", fence, value); - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return VK_NULL_HANDLE; @@ -724,7 +724,7 @@ static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct *completed_value = fence->value; - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return semaphore; } @@ -733,7 +733,7 @@ static void d3d12_fence_remove_vk_semaphore(struct d3d12_fence *fence, struct vk { int rc; - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -746,14 +746,14 @@ static void d3d12_fence_remove_vk_semaphore(struct d3d12_fence *fence, struct vk --fence->semaphore_count; - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); } static void d3d12_fence_release_vk_semaphore(struct d3d12_fence *fence, struct vkd3d_signaled_semaphore *semaphore) { int rc; - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -762,7 +762,7 @@ static void d3d12_fence_release_vk_semaphore(struct d3d12_fence *fence, struct v assert(semaphore->is_acquired); semaphore->is_acquired = false; - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); } static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence, @@ -780,7 +780,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence, return E_OUTOFMEMORY; } - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); vkd3d_free(semaphore); @@ -797,7 +797,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence, list_add_tail(&fence->semaphores, &semaphore->entry); ++fence->semaphore_count; - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return hr; } @@ -810,7 +810,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF unsigned int i, j; int rc; - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -844,7 +844,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF fence->event_count = j; if (signal_null_event_cond) - pthread_cond_broadcast(&fence->null_event_cond); + vkd3d_cond_broadcast(&fence->null_event_cond); if (vk_fence) { @@ -870,7 +870,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); } - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return S_OK; } @@ -926,9 +926,9 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) d3d12_fence_destroy_vk_objects(fence); vkd3d_free(fence->events); - if ((rc = pthread_mutex_destroy(&fence->mutex))) + if ((rc = vkd3d_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); - pthread_cond_destroy(&fence->null_event_cond); + vkd3d_cond_destroy(&fence->null_event_cond); vkd3d_free(fence); d3d12_device_release(device); @@ -995,13 +995,13 @@ static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface TRACE("iface %p.\n", iface); - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; } completed_value = fence->value; - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return completed_value; } @@ -1015,7 +1015,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); - if ((rc = pthread_mutex_lock(&fence->mutex))) + if ((rc = vkd3d_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -1025,7 +1025,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { if (event) fence->device->signal_event(event); - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return S_OK; } @@ -1036,7 +1036,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { WARN("Event completion for (%p, %#"PRIx64") is already in the list.\n", event, value); - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return S_OK; } } @@ -1045,7 +1045,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i fence->event_count + 1, sizeof(*fence->events))) { WARN("Failed to add event.\n"); - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return E_OUTOFMEMORY; } @@ -1062,10 +1062,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if (!event) { while (!*latch) - pthread_cond_wait(&fence->null_event_cond, &fence->mutex); + vkd3d_cond_wait(&fence->null_event_cond, &fence->mutex); } - pthread_mutex_unlock(&fence->mutex); + vkd3d_mutex_unlock(&fence->mutex); return S_OK; } @@ -1116,16 +1116,16 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->value = initial_value; - if ((rc = pthread_mutex_init(&fence->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&fence->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); } - if ((rc = pthread_cond_init(&fence->null_event_cond, NULL))) + if ((rc = vkd3d_cond_init(&fence->null_event_cond))) { ERR("Failed to initialize cond variable, error %d.\n", rc); - pthread_mutex_destroy(&fence->mutex); + vkd3d_mutex_destroy(&fence->mutex); return hresult_from_errno(rc); } @@ -1145,8 +1145,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { - pthread_mutex_destroy(&fence->mutex); - pthread_cond_destroy(&fence->null_event_cond); + vkd3d_mutex_destroy(&fence->mutex); + vkd3d_cond_destroy(&fence->null_event_cond); return hr; } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4bcb5efcbba9..fe90eb37ef00 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1878,7 +1878,7 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; - if ((rc = pthread_mutex_init(&device->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&device->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -1906,7 +1906,7 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); - pthread_mutex_destroy(&device->mutex); + vkd3d_mutex_destroy(&device->mutex); } #define VKD3D_VA_FALLBACK_BASE 0x8000000000000000ull @@ -1979,7 +1979,7 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al return 0; size = align(size, alignment); - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; @@ -1990,7 +1990,7 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al else address = vkd3d_gpu_va_allocator_allocate_fallback(allocator, alignment, size, ptr); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return address; } @@ -2061,7 +2061,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato return vkd3d_gpu_va_allocator_dereference_slab(allocator, address); /* Slow fallback. */ - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return NULL; @@ -2069,7 +2069,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato ret = vkd3d_gpu_va_allocator_dereference_fallback(allocator, address); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return ret; } @@ -2124,7 +2124,7 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12 { int rc; - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -2133,13 +2133,13 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12 if (address < VKD3D_VA_FALLBACK_BASE) { vkd3d_gpu_va_allocator_free_slab(allocator, address); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return; } vkd3d_gpu_va_allocator_free_fallback(allocator, address); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); } static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) @@ -2165,7 +2165,7 @@ static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator allocator->slabs[i].ptr = &allocator->slabs[i + 1]; } - if ((rc = pthread_mutex_init(&allocator->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&allocator->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); vkd3d_free(allocator->slabs); @@ -2179,15 +2179,15 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca { int rc; - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; } vkd3d_free(allocator->slabs); vkd3d_free(allocator->fallback_allocations); - pthread_mutex_unlock(&allocator->mutex); - pthread_mutex_destroy(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); + vkd3d_mutex_destroy(&allocator->mutex); } /* We could use bsearch() or recursion here, but it probably helps to omit @@ -2223,7 +2223,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a struct vkd3d_gpu_descriptor_allocation *allocation; int rc; - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return false; @@ -2232,7 +2232,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, allocator->allocation_count + 1, sizeof(*allocator->allocations))) { - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return false; } @@ -2247,7 +2247,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a allocation->base = base; allocation->count = count; - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return true; } @@ -2259,7 +2259,7 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( size_t i; int rc; - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return false; @@ -2277,7 +2277,7 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( break; } - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return found; } @@ -2301,7 +2301,7 @@ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( assert(allocator->allocation_count); - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; @@ -2311,7 +2311,7 @@ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( if ((allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc))) remaining = allocation->count - (desc - allocation->base); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return remaining; } @@ -2325,7 +2325,7 @@ struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descripto if (!allocator->allocation_count) return NULL; - if ((rc = pthread_mutex_lock(&allocator->mutex))) + if ((rc = vkd3d_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return NULL; @@ -2333,7 +2333,7 @@ struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descripto allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc); - pthread_mutex_unlock(&allocator->mutex); + vkd3d_mutex_unlock(&allocator->mutex); return allocation ? CONTAINING_RECORD(allocation->base, struct d3d12_descriptor_heap, descriptors) : NULL; @@ -2344,7 +2344,7 @@ static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allo int rc; memset(allocator, 0, sizeof(*allocator)); - if ((rc = pthread_mutex_init(&allocator->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&allocator->mutex))) { ERR("Failed to initialise mutex, error %d.\n", rc); return false; @@ -2356,7 +2356,7 @@ static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allo static void vkd3d_gpu_descriptor_allocator_cleanup(struct vkd3d_gpu_descriptor_allocator *allocator) { vkd3d_free(allocator->allocations); - pthread_mutex_destroy(&allocator->mutex); + vkd3d_mutex_destroy(&allocator->mutex); } static bool have_vk_time_domain(VkTimeDomainEXT *domains, unsigned int count, VkTimeDomainEXT domain) @@ -2479,7 +2479,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - pthread_mutex_destroy(&device->desc_mutex[i]); + vkd3d_mutex_destroy(&device->desc_mutex[i]); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); if (device->parent) IUnknown_Release(device->parent); @@ -3977,7 +3977,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_time_domains_init(device); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - pthread_mutex_init(&device->desc_mutex[i], NULL); + vkd3d_mutex_init(&device->desc_mutex[i]); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 19a163beead4..7b94ac926f28 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -326,7 +326,7 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); - pthread_mutex_destroy(&heap->mutex); + vkd3d_mutex_destroy(&heap->mutex); if (heap->is_private) device = NULL; @@ -443,7 +443,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, VkResult vr; int rc; - if ((rc = pthread_mutex_lock(&heap->mutex))) + if ((rc = vkd3d_mutex_lock(&heap->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); if (data) @@ -491,7 +491,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, *data = NULL; } - pthread_mutex_unlock(&heap->mutex); + vkd3d_mutex_unlock(&heap->mutex); return hr; } @@ -501,7 +501,7 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *res struct d3d12_device *device = heap->device; int rc; - if ((rc = pthread_mutex_lock(&heap->mutex))) + if ((rc = vkd3d_mutex_lock(&heap->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; @@ -535,7 +535,7 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *res } done: - pthread_mutex_unlock(&heap->mutex); + vkd3d_mutex_unlock(&heap->mutex); } static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) @@ -594,7 +594,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if (FAILED(hr = validate_heap_desc(&heap->desc, resource))) return hr; - if ((rc = pthread_mutex_init(&heap->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&heap->mutex))) { ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -602,7 +602,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if (FAILED(hr = vkd3d_private_store_init(&heap->private_store))) { - pthread_mutex_destroy(&heap->mutex); + vkd3d_mutex_destroy(&heap->mutex); return hr; } @@ -636,7 +636,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if (FAILED(hr)) { vkd3d_private_store_destroy(&heap->private_store); - pthread_mutex_destroy(&heap->mutex); + vkd3d_mutex_destroy(&heap->mutex); return hr; } @@ -2126,10 +2126,10 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr struct d3d12_device *device) { struct vkd3d_view *defunct_view = NULL; - pthread_mutex_t *mutex; + struct vkd3d_mutex *mutex; mutex = d3d12_device_get_descriptor_mutex(device, dst); - pthread_mutex_lock(mutex); + vkd3d_mutex_lock(mutex); /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) @@ -2138,7 +2138,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr *dst = *src; - pthread_mutex_unlock(mutex); + vkd3d_mutex_unlock(mutex); /* Destroy the view after unlocking to reduce wait time. */ if (defunct_view) @@ -2156,21 +2156,21 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { struct d3d12_desc tmp; - pthread_mutex_t *mutex; + struct vkd3d_mutex *mutex; assert(dst != src); /* Shadow of the Tomb Raider and possibly other titles sometimes destroy * and rewrite a descriptor in another thread while it is being copied. */ mutex = d3d12_device_get_descriptor_mutex(device, src); - pthread_mutex_lock(mutex); + vkd3d_mutex_lock(mutex); if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) vkd3d_view_incref(src->u.view); tmp = *src; - pthread_mutex_unlock(mutex); + vkd3d_mutex_unlock(mutex); d3d12_desc_write_atomic(dst, &tmp, device); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b54a6527c016..12c7a9e8f65c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1432,7 +1432,7 @@ HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, unsigned int i; int rc; - if ((rc = pthread_mutex_lock(&device->mutex))) + if ((rc = vkd3d_mutex_lock(&device->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); *vk_render_pass = VK_NULL_HANDLE; @@ -1454,7 +1454,7 @@ HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, if (!found) hr = vkd3d_render_pass_cache_create_pass_locked(cache, device, key, vk_render_pass); - pthread_mutex_unlock(&device->mutex); + vkd3d_mutex_unlock(&device->mutex); return hr; } @@ -3078,7 +3078,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 *vk_render_pass = VK_NULL_HANDLE; - if (!(rc = pthread_mutex_lock(&device->mutex))) + if (!(rc = vkd3d_mutex_lock(&device->mutex))) { LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) { @@ -3089,7 +3089,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 break; } } - pthread_mutex_unlock(&device->mutex); + vkd3d_mutex_unlock(&device->mutex); } else { @@ -3114,7 +3114,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta compiled_pipeline->vk_pipeline = vk_pipeline; compiled_pipeline->vk_render_pass = vk_render_pass; - if ((rc = pthread_mutex_lock(&device->mutex))) + if ((rc = vkd3d_mutex_lock(&device->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); vkd3d_free(compiled_pipeline); @@ -3134,7 +3134,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta if (compiled_pipeline) list_add_tail(&graphics->compiled_pipelines, &compiled_pipeline->entry); - pthread_mutex_unlock(&device->mutex); + vkd3d_mutex_unlock(&device->mutex); return compiled_pipeline; } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index cdb81f671b94..873f840ccf56 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -948,7 +948,7 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, if (!out_size) return E_INVALIDARG; - if ((rc = pthread_mutex_lock(&store->mutex))) + if ((rc = vkd3d_mutex_lock(&store->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -977,7 +977,7 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, memcpy(out, data->u.data, data->size); done: - pthread_mutex_unlock(&store->mutex); + vkd3d_mutex_unlock(&store->mutex); return hr; } @@ -987,7 +987,7 @@ HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, HRESULT hr; int rc; - if ((rc = pthread_mutex_lock(&store->mutex))) + if ((rc = vkd3d_mutex_lock(&store->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -995,7 +995,7 @@ HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false); - pthread_mutex_unlock(&store->mutex); + vkd3d_mutex_unlock(&store->mutex); return hr; } @@ -1006,7 +1006,7 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, HRESULT hr; int rc; - if ((rc = pthread_mutex_lock(&store->mutex))) + if ((rc = vkd3d_mutex_lock(&store->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -1014,7 +1014,7 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); - pthread_mutex_unlock(&store->mutex); + vkd3d_mutex_unlock(&store->mutex); return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d21cd411ec8a..bb7be99e7efc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -171,6 +171,62 @@ union vkd3d_thread_handle void *handle; }; +struct vkd3d_mutex +{ + pthread_mutex_t lock; +}; + +struct vkd3d_cond +{ + pthread_cond_t cond; +}; + + +static inline int vkd3d_mutex_init(struct vkd3d_mutex *lock) +{ + return pthread_mutex_init(&lock->lock, NULL); +} + +static inline int vkd3d_mutex_lock(struct vkd3d_mutex *lock) +{ + return pthread_mutex_lock(&lock->lock); +} + +static inline int vkd3d_mutex_unlock(struct vkd3d_mutex *lock) +{ + return pthread_mutex_unlock(&lock->lock); +} + +static inline int vkd3d_mutex_destroy(struct vkd3d_mutex *lock) +{ + return pthread_mutex_destroy(&lock->lock); +} + +static inline int vkd3d_cond_init(struct vkd3d_cond *cond) +{ + return pthread_cond_init(&cond->cond, NULL); +} + +static inline int vkd3d_cond_signal(struct vkd3d_cond *cond) +{ + return pthread_cond_signal(&cond->cond); +} + +static inline int vkd3d_cond_broadcast(struct vkd3d_cond *cond) +{ + return pthread_cond_broadcast(&cond->cond); +} + +static inline int vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) +{ + return pthread_cond_wait(&cond->cond, &lock->lock); +} + +static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) +{ + return pthread_cond_destroy(&cond->cond); +} + HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread); @@ -186,9 +242,9 @@ struct vkd3d_waiting_fence struct vkd3d_fence_worker { union vkd3d_thread_handle thread; - pthread_mutex_t mutex; - pthread_cond_t cond; - pthread_cond_t fence_destruction_cond; + struct vkd3d_mutex mutex; + struct vkd3d_cond cond; + struct vkd3d_cond fence_destruction_cond; bool should_exit; bool pending_fence_destruction; @@ -227,7 +283,7 @@ struct vkd3d_gpu_va_slab struct vkd3d_gpu_va_allocator { - pthread_mutex_t mutex; + struct vkd3d_mutex mutex; D3D12_GPU_VIRTUAL_ADDRESS fallback_floor; struct vkd3d_gpu_va_allocation *fallback_allocations; @@ -251,7 +307,7 @@ struct vkd3d_gpu_descriptor_allocation struct vkd3d_gpu_descriptor_allocator { - pthread_mutex_t mutex; + struct vkd3d_mutex mutex; struct vkd3d_gpu_descriptor_allocation *allocations; size_t allocations_size; @@ -294,7 +350,7 @@ void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache); struct vkd3d_private_store { - pthread_mutex_t mutex; + struct vkd3d_mutex mutex; struct list content; }; @@ -327,7 +383,7 @@ static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store list_init(&store->content); - if ((rc = pthread_mutex_init(&store->mutex, NULL))) + if ((rc = vkd3d_mutex_init(&store->mutex))) ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -342,7 +398,7 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store vkd3d_private_data_destroy(data); } - pthread_mutex_destroy(&store->mutex); + vkd3d_mutex_destroy(&store->mutex); } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out); @@ -366,8 +422,8 @@ struct d3d12_fence LONG refcount; uint64_t value; - pthread_mutex_t mutex; - pthread_cond_t null_event_cond; + struct vkd3d_mutex mutex; + struct vkd3d_cond null_event_cond; struct vkd3d_waiting_event { @@ -402,7 +458,7 @@ struct d3d12_heap bool is_private; D3D12_HEAP_DESC desc; - pthread_mutex_t mutex; + struct vkd3d_mutex mutex; VkDeviceMemory vk_memory; void *map_ptr; @@ -1041,7 +1097,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device, struct vkd3d_queue { /* Access to VkQueue must be externally synchronized. */ - pthread_mutex_t mutex; + struct vkd3d_mutex mutex; VkQueue vk_queue; @@ -1181,8 +1237,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_fence_worker fence_worker; - pthread_mutex_t mutex; - pthread_mutex_t desc_mutex[8]; + struct vkd3d_mutex mutex; + struct vkd3d_mutex desc_mutex[8]; struct vkd3d_render_pass_cache render_pass_cache; VkPipelineCache vk_pipeline_cache; @@ -1249,7 +1305,7 @@ static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(str return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type); } -static inline pthread_mutex_t *d3d12_device_get_descriptor_mutex(struct d3d12_device *device, +static inline struct vkd3d_mutex *d3d12_device_get_descriptor_mutex(struct d3d12_device *device, const struct d3d12_desc *descriptor) { STATIC_ASSERT(!(ARRAY_SIZE(device->desc_mutex) & (ARRAY_SIZE(device->desc_mutex) - 1))); -- 2.34.1

2 1

[PATCH vkd3d v4 1/7] tests: Test struct initializers.
by Matteo Bruni Feb. 4, 2022

Feb. 4, 2022

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v4: Tweak style a tiny bit. Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 84 +++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index 84c7b859..8cedf208 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-gather.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -299,6 +300,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..f4028b5b --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,84 @@ +[pixel shader] +struct stu +{ + int3 aaa; + float3 bbb; + int2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = + { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu +{ + int3 aaa; + float3 bbb[2]; + int2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = + { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu +{ + int3 aaa; + struct + { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = + { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.34.1

2 13

[PATCH] include: Add _sscanf_l.
by Daniel Lehman Feb. 4, 2022

Feb. 4, 2022

2 1

[PATCH v2] api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll.
by Andrey Gusev Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- v2: Updated spec entries. configure.ac | 1 + dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-ansi-l2-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 4 files changed, 8 insertions(+) create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec diff --git a/configure.ac b/configure.ac index 63e7aa7f5dd..e51e114c45e 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l2-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in new file mode 100644 index 00000000000..3a880198bd7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec new file mode 100644 index 00000000000..fcb48049250 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) advapi32.LookupAccountNameA +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidA +@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) advapi32.LookupPrivilegeDisplayNameA +@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) advapi32.LookupPrivilegeNameA +@ stdcall LookupPrivilegeValueA(str str ptr) advapi32.LookupPrivilegeValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index b5e6443dd3c..594e01396db 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-cryptoapi-l1-1-0", + "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0", -- 2.34.1

1 0