fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 12:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/glthread: Call unmarshal_batch directly in glthread_finish

Browse source 
Call it directly when batch queue is empty. This avoids costly thread
synchronisation. This commit improves performance of games that have
previously regressed with mesa_glthread=true.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Bartosz Tomczyk 2017-03-30 22:31:09 +02:00 • committed by Timothy Arceri
parent dbdd7231c2
commit 8d919ba384
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/mesa/main/glthread.c
View file

@ -194,16 +194,12 @@ _mesa_glthread_restore_dispatch(struct gl_context *ctx)
}
}
void
_mesa_glthread_flush_batch(struct gl_context *ctx)
static void
_mesa_glthread_flush_batch_locked(struct gl_context *ctx)
{
struct glthread_state *glthread = ctx->GLThread;
struct glthread_batch *batch;
struct glthread_batch *batch = glthread->batch;
if (!glthread)
return;
batch = glthread->batch;
if (!batch->used)
return;
@ -223,10 +219,26 @@ _mesa_glthread_flush_batch(struct gl_context *ctx)
return;
}
pthread_mutex_lock(&glthread->mutex);
*glthread->batch_queue_tail = batch;
glthread->batch_queue_tail = &batch->next;
pthread_cond_broadcast(&glthread->new_work);
}
void
_mesa_glthread_flush_batch(struct gl_context *ctx)
{
struct glthread_state *glthread = ctx->GLThread;
struct glthread_batch *batch;
if (!glthread)
return;
batch = glthread->batch;
if (!batch->used)
return;
pthread_mutex_lock(&glthread->mutex);
_mesa_glthread_flush_batch_locked(ctx);
pthread_mutex_unlock(&glthread->mutex);
}
@ -252,12 +264,20 @@ _mesa_glthread_finish(struct gl_context *ctx)
if (pthread_self() == glthread->thread)
return;
_mesa_glthread_flush_batch(ctx);
pthread_mutex_lock(&glthread->mutex);
while (glthread->batch_queue || glthread->busy)
pthread_cond_wait(&glthread->work_done, &glthread->mutex);
if (!(glthread->batch_queue || glthread->busy)) {
if (glthread->batch && glthread->batch->used) {
struct _glapi_table *dispatch = _glapi_get_dispatch();
glthread_unmarshal_batch(ctx, glthread->batch);
_glapi_set_dispatch(dispatch);
glthread_allocate_batch(ctx);
}
} else {
_mesa_glthread_flush_batch_locked(ctx);
while (glthread->batch_queue || glthread->busy)
pthread_cond_wait(&glthread->work_done, &glthread->mutex);
}
pthread_mutex_unlock(&glthread->mutex);
}