AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Kill macro _EGL_DECLARE_MUTEX

Browse Source 
Replace all occurences of the macro with its expansion.

It seems that the macro intended to provide cross-platform static mutex
intialization. However, it had the same definition in all pre-processor
paths:
    #define _EGL_DECLARE_MUTEX(m) _EGLMutex m = _EGL_MUTEX_INITIALIZER

Therefore this abstraction obscured rather than helped.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Chad Versace
2013-10-11 12:50:21 -07:00
parent 3c58d4c700
commit 97851145bc
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/egl/main/eglcurrent.c
View File

@@ -45,7 +45,7 @@ static _EGLThreadInfo dummy_thread = _EGL_THREAD_INFO_INITIALIZER;
#if HAVE_PTHREAD
#include <pthread.h>
static _EGL_DECLARE_MUTEX(_egl_TSDMutex);
static _EGLMutex _egl_TSDMutex = _EGL_MUTEX_INITIALIZER;
static EGLBoolean _egl_TSDInitialized;
static pthread_key_t _egl_TSD;
static void (*_egl_FreeTSD)(_EGLThreadInfo *);

2
src/egl/main/egldriver.c
View File

@@ -60,7 +60,7 @@ typedef struct _egl_module {
_EGLDriver *Driver;
} _EGLModule;
static _EGL_DECLARE_MUTEX(_eglModuleMutex);
static _EGLMutex _eglModuleMutex = _EGL_MUTEX_INITIALIZER;
static _EGLArray *_eglModules;
const struct {

3
src/egl/main/eglglobals.c
View File

@@ -36,7 +36,8 @@
#include "eglmutex.h"
static _EGL_DECLARE_MUTEX(_eglGlobalMutex);
static _EGLMutex _eglGlobalMutex = _EGL_MUTEX_INITIALIZER;
struct _egl_global _eglGlobal =
{
&_eglGlobalMutex, /* Mutex */

4
src/egl/main/eglmutex.h
View File

@@ -60,8 +60,6 @@ _eglUnlockMutex(_EGLMutex *m)
}
#define _EGL_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
#define _EGL_DECLARE_MUTEX(m) \
_EGLMutex m = _EGL_MUTEX_INITIALIZER
#else
@@ -72,8 +70,6 @@ static INLINE void _eglLockMutex(_EGLMutex *m) { (void) m; }
static INLINE void _eglUnlockMutex(_EGLMutex *m) { (void) m; }
#define _EGL_MUTEX_INITIALIZER 0
#define _EGL_DECLARE_MUTEX(m) \
_EGLMutex m = _EGL_MUTEX_INITIALIZER
#endif

2
src/egl/main/eglscreen.c
View File

@@ -57,7 +57,7 @@
/* ugh, no atomic op? */
static _EGL_DECLARE_MUTEX(_eglNextScreenHandleMutex);
static _EGLMutex _eglNextScreenHandleMutex = _EGL_MUTEX_INITIALIZER;
static EGLScreenMESA _eglNextScreenHandle = 1;