#include "main/mtypes.h"
#include "main/glthread.h"
#include "main/marshal.h"
-#include "main/marshal_generated.h"
+#include "main/hash.h"
#include "util/u_atomic.h"
#include "util/u_thread.h"
{
struct glthread_batch *batch = (struct glthread_batch*)job;
struct gl_context *ctx = batch->ctx;
- size_t pos = 0;
+ int pos = 0;
+ int used = batch->used;
+ uint8_t *buffer = batch->buffer;
_glapi_set_dispatch(ctx->CurrentServerDispatch);
- while (pos < batch->used)
- pos += _mesa_unmarshal_dispatch_cmd(ctx, &batch->buffer[pos]);
+ while (pos < used) {
+ const struct marshal_cmd_base *cmd =
+ (const struct marshal_cmd_base *)&buffer[pos];
- assert(pos == batch->used);
+ _mesa_unmarshal_dispatch[cmd->cmd_id](ctx, cmd);
+ pos += cmd->cmd_size;
+ }
+
+ assert(pos == used);
batch->used = 0;
}
return;
}
+ glthread->VAOs = _mesa_NewHashTable();
+ if (!glthread->VAOs) {
+ util_queue_destroy(&glthread->queue);
+ free(glthread);
+ return;
+ }
+ glthread->CurrentVAO = &glthread->DefaultVAO;
+
ctx->MarshalExec = _mesa_create_marshal_table(ctx);
if (!ctx->MarshalExec) {
+ _mesa_DeleteHashTable(glthread->VAOs);
util_queue_destroy(&glthread->queue);
free(glthread);
return;
util_queue_fence_destroy(&fence);
}
+static void
+free_vao(GLuint key, void *data, void *userData)
+{
+ free(data);
+}
+
void
_mesa_glthread_destroy(struct gl_context *ctx)
{
for (unsigned i = 0; i < MARSHAL_MAX_BATCHES; i++)
util_queue_fence_destroy(&glthread->batches[i].fence);
+ _mesa_HashDeleteAll(glthread->VAOs, free_vao, NULL);
+ _mesa_DeleteHashTable(glthread->VAOs);
+
free(glthread);
ctx->GLThread = NULL;
}
}
+void
+_mesa_glthread_disable(struct gl_context *ctx, const char *func)
+{
+ _mesa_glthread_finish_before(ctx, func);
+ _mesa_glthread_restore_dispatch(ctx, func);
+}
+
void
_mesa_glthread_flush_batch(struct gl_context *ctx)
{
if (synced)
p_atomic_inc(&glthread->stats.num_syncs);
}
+
+void
+_mesa_glthread_finish_before(struct gl_context *ctx, const char *func)
+{
+ _mesa_glthread_finish(ctx);
+
+ /* Uncomment this if you want to know where glthread syncs. */
+ /*printf("fallback to sync: %s\n", func);*/
+}