Mesa (master): mesa/glthread: Avoid unnecessary batch reallocation
Timothy Arceri
tarceri at kemper.freedesktop.org
Mon Apr 3 23:57:02 UTC 2017
Module: Mesa
Branch: master
Commit: 64b3aa7ad8f1f5aac8bac9b58aae9dd2ac837d8b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64b3aa7ad8f1f5aac8bac9b58aae9dd2ac837d8b
Author: Bartosz Tomczyk <bartosz.tomczyk86 at gmail.com>
Date: Mon Apr 3 21:19:40 2017 +0200
mesa/glthread: Avoid unnecessary batch reallocation
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
src/mesa/main/glthread.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index 3f07c420d4..c4d3f4a434 100644
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -53,7 +53,8 @@ glthread_allocate_batch(struct gl_context *ctx)
}
static void
-glthread_unmarshal_batch(struct gl_context *ctx, struct glthread_batch *batch)
+glthread_unmarshal_batch(struct gl_context *ctx, struct glthread_batch *batch,
+ const bool release_batch)
{
size_t pos = 0;
@@ -64,7 +65,10 @@ glthread_unmarshal_batch(struct gl_context *ctx, struct glthread_batch *batch)
assert(pos == batch->used);
- free(batch);
+ if (release_batch)
+ free(batch);
+ else
+ batch->used = 0;
}
static void *
@@ -103,7 +107,7 @@ glthread_worker(void *data)
glthread->busy = true;
pthread_mutex_unlock(&glthread->mutex);
- glthread_unmarshal_batch(ctx, batch);
+ glthread_unmarshal_batch(ctx, batch, true);
pthread_mutex_lock(&glthread->mutex);
glthread->busy = false;
@@ -214,7 +218,7 @@ _mesa_glthread_flush_batch_locked(struct gl_context *ctx)
* need to restore it when it returns.
*/
if (false) {
- glthread_unmarshal_batch(ctx, batch);
+ glthread_unmarshal_batch(ctx, batch, true);
_glapi_set_dispatch(ctx->CurrentClientDispatch);
return;
}
@@ -269,9 +273,8 @@ _mesa_glthread_finish(struct gl_context *ctx)
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);
+ glthread_unmarshal_batch(ctx, glthread->batch, false);
_glapi_set_dispatch(dispatch);
- glthread_allocate_batch(ctx);
}
} else {
_mesa_glthread_flush_batch_locked(ctx);
More information about the mesa-commit
mailing list