summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-09-12 21:07:40 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-09-12 21:07:40 +0000
commite4b684ce49188f906ff032e2df7675257143ec21 (patch)
treeae1f30464a354bc084faf69e14c5b79ff42ad129 /src/mesa/main
parentd49b34a233628a476b87dd2e2609405d76ac8866 (diff)
init mutex
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/context.c7
-rw-r--r--src/mesa/main/texobj.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 5ea29d924d..b9eca9fca6 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,8 +1,8 @@
-/* $Id: context.c,v 1.84 2000/09/08 21:28:04 brianp Exp $ */
+/* $Id: context.c,v 1.85 2000/09/12 21:07:40 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -457,8 +457,9 @@ alloc_shared_state( void )
if (!ss)
return NULL;
- ss->DisplayList = _mesa_NewHashTable();
+ _glthread_INIT_MUTEX(ss->Mutex);
+ ss->DisplayList = _mesa_NewHashTable();
ss->TexObjects = _mesa_NewHashTable();
/* Default Texture objects */
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index e06f8cd277..a9248a78f4 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.26 2000/08/03 14:03:17 brianp Exp $ */
+/* $Id: texobj.c,v 1.27 2000/09/12 21:07:41 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -63,6 +63,7 @@ gl_alloc_texture_object( struct gl_shared_state *shared, GLuint name,
if (obj) {
/* init the non-zero fields */
+ _glthread_INIT_MUTEX(obj->Mutex);
obj->RefCount = 1;
obj->Name = name;
obj->Dimensions = dimensions;