summaryrefslogtreecommitdiff
path: root/src/egl/main
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2009-08-10 16:37:28 +0800
committerBrian Paul <brianp@vmware.com>2009-08-11 22:14:35 -0600
commit0e3687e33dd482115c1a0e39c50b424936cb05a6 (patch)
tree46414ccec9fd77e32b9158b4cf90b6884c6eeb1d /src/egl/main
parent413969a92052c019bcf3c5bf48cf564613eba598 (diff)
egl: Make _eglGlobal initialize statically.
Now that display and surface hash tables are moved out, _eglGlobal can be initialized statically. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Diffstat (limited to 'src/egl/main')
-rw-r--r--src/egl/main/eglapi.c1
-rw-r--r--src/egl/main/eglglobals.c32
-rw-r--r--src/egl/main/eglglobals.h10
3 files changed, 6 insertions, 37 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index f0a6f7f935..fde6b7316c 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -50,7 +50,6 @@ EGLDisplay EGLAPIENTRY
eglGetDisplay(NativeDisplayType nativeDisplay)
{
_EGLDisplay *dpy;
- _eglInitGlobals();
dpy = _eglFindDisplay(nativeDisplay);
if (!dpy) {
dpy = _eglNewDisplay(nativeDisplay);
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index f2c1c217a5..8703168650 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -3,31 +3,11 @@
#include "egldisplay.h"
#include "egllog.h"
-struct _egl_global _eglGlobal =
+struct _egl_global _eglGlobal =
{
- EGL_FALSE
+ 1, /* FreeScreenHandle */
+ 0x0, /* ClientAPIsMask */
+ { 0x0 }, /* ClientAPIs */
+ 0, /* NumDrivers */
+ { NULL }, /* Drivers */
};
-
-/**
- * Init the fields in the _eglGlobal struct
- * May be safely called more than once.
- */
-void
-_eglInitGlobals(void)
-{
- if (!_eglGlobal.Initialized) {
- _eglGlobal.FreeScreenHandle = 1;
- _eglGlobal.Initialized = EGL_TRUE;
-
- _eglGlobal.ClientAPIsMask = 0x0;
- }
-}
-
-
-/**
- * Should call this via an atexit handler.
- */
-void
-_eglDestroyGlobals(void)
-{
-}
diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h
index 47fd943fd5..2f3c211476 100644
--- a/src/egl/main/eglglobals.h
+++ b/src/egl/main/eglglobals.h
@@ -11,8 +11,6 @@
*/
struct _egl_global
{
- EGLBoolean Initialized;
-
EGLScreenMESA FreeScreenHandle;
/* bitmaks of supported APIs (supported by _some_ driver) */
@@ -28,12 +26,4 @@ struct _egl_global
extern struct _egl_global _eglGlobal;
-extern void
-_eglInitGlobals(void);
-
-
-extern void
-_eglDestroyGlobals(void);
-
-
#endif /* EGLGLOBALS_INCLUDED */