egl/main: use c11/threads' mutex directly

[mesa.git] / src / egl / main / eglglobals.c

diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 5c2fddfbf9ee9420c1df57d5f78373fcde2af405..129bf29f1e95bb65d3d1d94403dcc9a11fac9ccc 100644 (file)
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * Copyright 2009-2010 Chia-I Wu <olvaffe@gmail.com>
  * Copyright 2010-2011 LunarG, Inc.
  * All Rights Reserved.
@@ -30,13 +30,15 @@
 
 #include <stdlib.h>
 #include <assert.h>
+#include "c11/threads.h"
+
 #include "eglglobals.h"
 #include "egldisplay.h"
 #include "egldriver.h"
-#include "eglmutex.h"
 
 
-static _EGL_DECLARE_MUTEX(_eglGlobalMutex);
+static mtx_t _eglGlobalMutex = _MTX_INITIALIZER_NP;
+
 struct _egl_global _eglGlobal =
 {
    &_eglGlobalMutex,       /* Mutex */
@@ -50,11 +52,21 @@ struct _egl_global _eglGlobal =
 
    /* ClientExtensions */
    {
-      true /* EGL_EXT_client_extensions */
+      true, /* EGL_EXT_client_extensions */
+      true, /* EGL_EXT_platform_base */
+      true, /* EGL_EXT_platform_x11 */
+      true, /* EGL_EXT_platform_wayland */
+      true, /* EGL_MESA_platform_gbm */
+      true, /* EGL_KHR_client_get_all_proc_addresses */
    },
 
    /* ClientExtensionsString */
    "EGL_EXT_client_extensions"
+   " EGL_EXT_platform_base"
+   " EGL_EXT_platform_x11"
+   " EGL_EXT_platform_wayland"
+   " EGL_MESA_platform_gbm"
+   " EGL_KHR_client_get_all_proc_addresses"
 };
 
 
@@ -73,7 +85,7 @@ _eglAddAtExitCall(void (*func)(void))
    if (func) {
       static EGLBoolean registered = EGL_FALSE;
 
-      _eglLockMutex(_eglGlobal.Mutex);
+      mtx_lock(_eglGlobal.Mutex);
 
       if (!registered) {
          atexit(_eglAtExit);
@@ -83,6 +95,6 @@ _eglAddAtExitCall(void (*func)(void))
       assert(_eglGlobal.NumAtExitCalls < ARRAY_SIZE(_eglGlobal.AtExitCalls));
       _eglGlobal.AtExitCalls[_eglGlobal.NumAtExitCalls++] = func;
 
-      _eglUnlockMutex(_eglGlobal.Mutex);
+      mtx_unlock(_eglGlobal.Mutex);
    }
 }