diff options
Diffstat (limited to 'src/egl/main/egldisplay.c')
-rw-r--r-- | src/egl/main/egldisplay.c | 96 |
1 files changed, 19 insertions, 77 deletions
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index d7a8d14292..5dc5fd9719 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -45,72 +45,8 @@ _eglFiniDisplay(void) /** - * Allocate a new _EGLDisplay object for the given nativeDisplay handle. - * We'll also try to determine the device driver name at this time. - * - * Note that nativeDisplay may be an X Display ptr, or a string. - */ -_EGLDisplay * -_eglNewDisplay(EGLNativeDisplayType nativeDisplay) -{ - _EGLDisplay *dpy = (_EGLDisplay *) calloc(1, sizeof(_EGLDisplay)); - if (dpy) { - dpy->NativeDisplay = nativeDisplay; - } - return dpy; -} - - -/** - * Link a display to itself and return the handle of the link. - * The handle can be passed to client directly. - */ -EGLDisplay -_eglLinkDisplay(_EGLDisplay *dpy) -{ - _eglLockMutex(_eglGlobal.Mutex); - - dpy->Next = _eglGlobal.DisplayList; - _eglGlobal.DisplayList = dpy; - - _eglUnlockMutex(_eglGlobal.Mutex); - - return (EGLDisplay) dpy; -} - - -/** - * Unlink a linked display from itself. - * Accessing an unlinked display should generate EGL_BAD_DISPLAY error. - */ -void -_eglUnlinkDisplay(_EGLDisplay *dpy) -{ - _EGLDisplay *prev; - - _eglLockMutex(_eglGlobal.Mutex); - - prev = _eglGlobal.DisplayList; - if (prev != dpy) { - while (prev) { - if (prev->Next == dpy) - break; - prev = prev->Next; - } - assert(prev); - prev->Next = dpy->Next; - } - else { - _eglGlobal.DisplayList = dpy->Next; - } - - _eglUnlockMutex(_eglGlobal.Mutex); -} - - -/** - * Find the display corresponding to the specified native display id in all - * linked displays. + * Find the display corresponding to the specified native display, or create a + * new one. */ _EGLDisplay * _eglFindDisplay(EGLNativeDisplayType nativeDisplay) @@ -119,18 +55,30 @@ _eglFindDisplay(EGLNativeDisplayType nativeDisplay) _eglLockMutex(_eglGlobal.Mutex); + /* search the display list first */ dpy = _eglGlobal.DisplayList; while (dpy) { - if (dpy->NativeDisplay == nativeDisplay) { - _eglUnlockMutex(_eglGlobal.Mutex); - return dpy; - } + if (dpy->NativeDisplay == nativeDisplay) + break; dpy = dpy->Next; } + /* create a new display */ + if (!dpy) { + dpy = (_EGLDisplay *) calloc(1, sizeof(_EGLDisplay)); + if (dpy) { + _eglInitMutex(&dpy->Mutex); + dpy->NativeDisplay = nativeDisplay; + + /* add to the display list */ + dpy->Next = _eglGlobal.DisplayList; + _eglGlobal.DisplayList = dpy; + } + } + _eglUnlockMutex(_eglGlobal.Mutex); - return NULL; + return dpy; } @@ -186,9 +134,6 @@ _eglCleanupDisplay(_EGLDisplay *disp) } -#ifndef _EGL_SKIP_HANDLE_CHECK - - /** * Return EGL_TRUE if the given handle is a valid handle to a display. */ @@ -233,9 +178,6 @@ _eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy) } -#endif /* !_EGL_SKIP_HANDLE_CHECK */ - - /** * Link a resource to a display. */ |