OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mechanism to destroy mutexes. Important on OS's where mutex initialization

Browse Source 
allocates memory (like FreeBSD).
This commit is contained in:
Keith Whitwell
2002-12-12 13:03:15 +00:00
parent 76d2a77291
commit e15fd85727
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/glapi/glthread.h
View File

@@ -1,4 +1,4 @@
/* $Id: glthread.h,v 1.11 2002/03/07 21:50:41 brianp Exp $ */
/* $Id: glthread.h,v 1.12 2002/12/12 13:03:15 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -101,6 +101,9 @@ typedef pthread_mutex_t _glthread_Mutex;
#define _glthread_INIT_MUTEX(name) \
pthread_mutex_init(&(name), NULL)
#define _glthread_DESTROY_MUTEX(name) \
pthread_mutex_destroy(&(name))
#define _glthread_LOCK_MUTEX(name) \
(void) pthread_mutex_lock(&(name))
@@ -134,6 +137,7 @@ typedef mutex_t _glthread_Mutex;
/* XXX need to really implement mutex-related macros */
#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0
#define _glthread_INIT_MUTEX(name) (void) name
#define _glthread_DESTROY_MUTEX(name) (void) name
#define _glthread_LOCK_MUTEX(name) (void) name
#define _glthread_UNLOCK_MUTEX(name) (void) name
@@ -162,6 +166,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
/* XXX need to really implement mutex-related macros */
#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0
#define _glthread_INIT_MUTEX(name) (void) name
#define _glthread_DESTROY_MUTEX(name) (void) name
#define _glthread_LOCK_MUTEX(name) (void) name
#define _glthread_UNLOCK_MUTEX(name) (void) name
@@ -197,6 +202,9 @@ typedef xmutex_rec _glthread_Mutex;
#define _glthread_INIT_MUTEX(name) \
xmutex_init(&(name))
#define _glthread_DESTROY_MUTEX(name) \
xmutex_clear(&(name))
#define _glthread_LOCK_MUTEX(name) \
(void) xmutex_lock(&(name))
@@ -254,6 +262,8 @@ typedef GLuint _glthread_Mutex;
#define _glthread_INIT_MUTEX(name) (void) name
#define _glthread_DESTROY_MUTEX(name) (void) name
#define _glthread_LOCK_MUTEX(name) (void) name
#define _glthread_UNLOCK_MUTEX(name) (void) name

4
src/mesa/main/context.c
View File

@@ -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);
}

3
src/mesa/main/hash.c
View File

@@ -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);
}

5
src/mesa/main/texobj.c
View File

@@ -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 );
}