OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Replace pthread thread with thrd_t

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7866>
This commit is contained in:
James Park
2020-11-26 19:31:42 -08:00
committed by Marge Bot
parent 63dc2a53af
commit 3ff1eccce6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/vulkan/radv_device.c
View File

@@ -2376,7 +2376,7 @@ radv_queue_finish(struct radv_queue *queue)
if (queue->thread_running) {
p_atomic_set(&queue->thread_exit, true);
u_cnd_monotonic_broadcast(&queue->thread_cond);
pthread_join(queue->submission_thread, NULL);
thrd_join(queue->submission_thread, NULL);
}
u_cnd_monotonic_destroy(&queue->thread_cond);
@@ -4719,7 +4719,7 @@ wait_for_submission_timelines_available(struct radv_deferred_queue_submission *s
return success ? VK_SUCCESS : VK_TIMEOUT;
}
static void* radv_queue_submission_thread_run(void *q)
static int radv_queue_submission_thread_run(void *q)
{
struct radv_queue *queue = q;
@@ -4755,7 +4755,7 @@ static void* radv_queue_submission_thread_run(void *q)
mtx_lock(&queue->thread_mutex);
}
mtx_unlock(&queue->thread_mutex);
return NULL;
return 0;
}
static VkResult
@@ -4783,8 +4783,8 @@ radv_queue_trigger_submission(struct radv_deferred_queue_submission *submission,
/* Only start the thread on demand to save resources for the many games
* which only use binary semaphores. */
if (!queue->thread_running) {
ret = pthread_create(&queue->submission_thread, NULL,
radv_queue_submission_thread_run, queue);
ret = thrd_create(&queue->submission_thread,
radv_queue_submission_thread_run, queue);
if (ret) {
mtx_unlock(&queue->thread_mutex);
return vk_errorf(queue->device->instance,

2
src/amd/vulkan/radv_private.h
View File

@@ -732,7 +732,7 @@ struct radv_queue {
mtx_t thread_mutex;
struct u_cnd_monotonic thread_cond;
struct radv_deferred_queue_submission *thread_submission;
pthread_t submission_thread;
thrd_t submission_thread;
bool thread_exit;
bool thread_running;
bool cond_created;