glthread: track for each VAO whether the user has set a user pointer

[mesa.git] / src / mesa / main / glthread.c

diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index af4eb15cb4de01e9d14164d2daf972a024b3bd1f..4288c9aedbb03f00fbd980e67abbaced7e3b702b 100644 (file)
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -35,6 +35,7 @@
 #include "main/mtypes.h"
 #include "main/glthread.h"
 #include "main/marshal.h"
+#include "main/hash.h"
 #include "util/u_atomic.h"
 #include "util/u_thread.h"
 
@@ -85,8 +86,17 @@ _mesa_glthread_init(struct gl_context *ctx)
       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;
@@ -110,6 +120,12 @@ _mesa_glthread_init(struct gl_context *ctx)
    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)
 {
@@ -124,6 +140,9 @@ _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;