summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-12-12 13:03:15 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-12-12 13:03:15 +0000
commite15fd85727636627e0cc7d4fd2d5367e178e42cc (patch)
treebf71880e9da3502750d509739ebb7afe06d43f40 /src/mesa/main
parent76d2a77291eb323c138751c0c605d120efe6cb38 (diff)
Add mechanism to destroy mutexes. Important on OS's where mutex initialization
allocates memory (like FreeBSD).
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/context.c4
-rw-r--r--src/mesa/main/hash.c3
-rw-r--r--src/mesa/main/texobj.c5
3 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4656f25a70..2784fa82bd 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.189 2002/11/19 15:25:00 brianp Exp $ */
+/* $Id: context.c,v 1.190 2002/12/12 13:03:15 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -746,6 +746,8 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
_mesa_DeleteHashTable(ss->VertexPrograms);
#endif
+ _glthread_DESTROY_MUTEX(ss->Mutex);
+
FREE(ss);
}
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 71df0cbf5b..b22ee2551a 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -1,4 +1,4 @@
-/* $Id: hash.c,v 1.14 2002/10/24 23:57:21 brianp Exp $ */
+/* $Id: hash.c,v 1.15 2002/12/12 13:03:15 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -94,6 +94,7 @@ void _mesa_DeleteHashTable(struct _mesa_HashTable *table)
entry = next;
}
}
+ _glthread_DESTROY_MUTEX(table->Mutex);
FREE(table);
}
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 93ae40ac74..f24a0b03de 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.62 2002/10/24 23:57:21 brianp Exp $ */
+/* $Id: texobj.c,v 1.63 2002/12/12 13:03:15 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -164,6 +164,9 @@ void _mesa_free_texture_object( struct gl_shared_state *shared,
}
}
+ /* destroy the mutex -- it may have allocated memory (eg on bsd) */
+ _glthread_DESTROY_MUTEX(t->Mutex);
+
/* free this object */
FREE( t );
}