commit 832179c50e2cf5de9735241e4767aea4d6fc33bf
author Brian Paul <brian.paul@tungstengraphics.com> Tue Mar 21 17:42:27 2000 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Mar 21 17:42:27 2000 +0000
tree 7f265a594dcaa0bb05258067852d9615330c2fbc
parent fd2e6dbbc8f5d2283b2cf282687a06d68b056e59

added more locking

src/mesa/main/texobj.c

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index f782212..02de5a3 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.14 2000/02/12 01:59:19 brianp Exp $ */
+/* $Id: texobj.c,v 1.15 2000/03/21 17:42:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -325,6 +325,8 @@
 }
 
 
+_glthread_DECLARE_STATIC_MUTEX(GenTexturesLock);
+
 
 /*
  * Execute glGenTextures
@@ -342,6 +344,12 @@
       return;
    }
 
+
+   /*
+    * This must be atomic (generation and allocation of texture IDs)
+    */
+   _glthread_LOCK_MUTEX(GenTexturesLock);
+
    first = _mesa_HashFindFreeKeyBlock(ctx->Shared->TexObjects, n);
 
    /* Return the texture names */
@@ -355,6 +363,8 @@
       GLuint dims = 0;
       (void) gl_alloc_texture_object(ctx->Shared, name, dims);
    }
+
+   _glthread_UNLOCK_MUTEX(GenTexturesLock);
 }