Module: Mesa Branch: master Commit: f298720cbcf311804e9f4479d27ad06e1b932007 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f298720cbcf311804e9f4479d27ad06e1b932007
Author: José Fonseca <jfons...@vmware.com> Date: Fri Apr 26 08:04:17 2013 +0100 egl: Use C11 thread abstractions. Reviewed-by: Brian Paul <bri...@vmware.com> Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Chad Versace <chad.vers...@linux.intel.com> --- src/egl/main/eglmutex.h | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/egl/main/eglmutex.h b/src/egl/main/eglmutex.h index 1349e9e..2ec965c 100644 --- a/src/egl/main/eglmutex.h +++ b/src/egl/main/eglmutex.h @@ -31,46 +31,34 @@ #include "eglcompiler.h" -#ifdef HAVE_PTHREAD -#include <pthread.h> +#include "c11/threads.h" -typedef pthread_mutex_t _EGLMutex; +typedef mtx_t _EGLMutex; static INLINE void _eglInitMutex(_EGLMutex *m) { - pthread_mutex_init(m, NULL); + mtx_init(m, mtx_plain); } static INLINE void _eglDestroyMutex(_EGLMutex *m) { - pthread_mutex_destroy(m); + mtx_destroy(m); } static INLINE void _eglLockMutex(_EGLMutex *m) { - pthread_mutex_lock(m); + mtx_lock(m); } static INLINE void _eglUnlockMutex(_EGLMutex *m) { - pthread_mutex_unlock(m); + mtx_unlock(m); } -#define _EGL_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#define _EGL_MUTEX_INITIALIZER _MTX_INITIALIZER_NP -#else - -typedef int _EGLMutex; -static INLINE void _eglInitMutex(_EGLMutex *m) { (void) m; } -static INLINE void _eglDestroyMutex(_EGLMutex *m) { (void) m; } -static INLINE void _eglLockMutex(_EGLMutex *m) { (void) m; } -static INLINE void _eglUnlockMutex(_EGLMutex *m) { (void) m; } - -#define _EGL_MUTEX_INITIALIZER 0 - -#endif #endif /* EGLMUTEX_INCLUDED */ _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit