diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-17 14:46:40 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-17 14:46:40 -0400 |
| commit | e910f6831b4e7033a0d5cbd83bdab191d622bad0 (patch) | |
| tree | f5a386cad3583d60757e2837418b734f09e76295 /src/egl/main/eglglobals.h | |
| parent | 79a170108f1d9cad949cd2a34e4de597beae72db (diff) | |
| parent | 30bccf8ea9cd84d1a52a31b6f86b783dfb919374 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewriter6xx-rewrite
Diffstat (limited to 'src/egl/main/eglglobals.h')
| -rw-r--r-- | src/egl/main/eglglobals.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h index 14d8ea487a..a9443cfbdd 100644 --- a/src/egl/main/eglglobals.h +++ b/src/egl/main/eglglobals.h @@ -3,17 +3,7 @@ #include "egltypedefs.h" #include "eglhash.h" - - -/** - * Per-thread info - */ -struct _egl_thread_info -{ - EGLint LastError; - _EGLContext *CurrentContext; - EGLenum CurrentAPI; -}; +#include "eglcurrent.h" /** @@ -23,6 +13,7 @@ struct _egl_global { EGLBoolean Initialized; + /* these are private to egldisplay.c */ _EGLHashtable *Displays; _EGLHashtable *Surfaces; @@ -33,9 +24,6 @@ struct _egl_global char ClientAPIs[1000]; /**< updated by eglQueryString */ - /* XXX temporary - should be thread-specific data (TSD) */ - _EGLThreadInfo *ThreadInfo; - EGLint NumDrivers; _EGLDriver *Drivers[10]; }; @@ -52,20 +40,4 @@ extern void _eglDestroyGlobals(void); -extern _EGLThreadInfo * -_eglNewThreadInfo(void); - - -extern void -_eglDeleteThreadData(_EGLThreadInfo *t); - - -extern _EGLThreadInfo * -_eglGetCurrentThread(void); - - -extern void -_eglError(EGLint errCode, const char *msg); - - #endif /* EGLGLOBALS_INCLUDED */ |