diff options
author | Chia-I Wu <olvaffe@gmail.com> | 2009-07-16 21:21:57 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-07-17 11:54:06 -0600 |
commit | 3f7e0d5302ed0fadd794a41af6e476d2c408adc7 (patch) | |
tree | 4359eb96a321daf1df24d614784f6771a880b654 /src/egl | |
parent | be9d1ab171b1b29108c781af84dd500707a12925 (diff) | |
download | external_mesa3d-3f7e0d5302ed0fadd794a41af6e476d2c408adc7.zip external_mesa3d-3f7e0d5302ed0fadd794a41af6e476d2c408adc7.tar.gz external_mesa3d-3f7e0d5302ed0fadd794a41af6e476d2c408adc7.tar.bz2 |
egl: Destroy display's resources upon termination.
eglTerminate should destroy the contexts and surfaces of the display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Diffstat (limited to 'src/egl')
-rw-r--r-- | src/egl/main/egldisplay.c | 32 | ||||
-rw-r--r-- | src/egl/main/egldisplay.h | 4 | ||||
-rw-r--r-- | src/egl/main/egldriver.c | 4 |
3 files changed, 37 insertions, 3 deletions
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 1f1f41e..89de609 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -121,6 +121,38 @@ _eglFindDisplay(NativeDisplayType nativeDisplay) /** + * Destroy the contexts and surfaces that are linked to the display. + */ +void +_eglReleaseDisplayResources(_EGLDriver *drv, EGLDisplay dpy) +{ + _EGLDisplay *display; + _EGLContext *contexts; + _EGLSurface *surfaces; + + display = _eglLookupDisplay(dpy); + if (!display) + return; + contexts = display->ContextList; + surfaces = display->SurfaceList; + + while (contexts) { + EGLContext handle = _eglGetContextHandle(contexts); + contexts = contexts->Next; + drv->API.DestroyContext(drv, dpy, handle); + } + assert(!display->ContextList); + + while (surfaces) { + EGLSurface handle = _eglGetSurfaceHandle(surfaces); + surfaces = surfaces->Next; + drv->API.DestroySurface(drv, dpy, handle); + } + assert(!display->SurfaceList); +} + + +/** * Free all the data hanging of an _EGLDisplay object, but not * the object itself. */ diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 0a6003f..30b466c 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -57,6 +57,10 @@ _eglFindDisplay(NativeDisplayType nativeDisplay); extern void +_eglReleaseDisplayResources(_EGLDriver *drv, EGLDisplay dpy); + + +extern void _eglCleanupDisplay(_EGLDisplay *disp); diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 43b1f51..f2a864c 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -284,9 +284,7 @@ _eglCloseDriver(_EGLDriver *drv, EGLDisplay dpy) _eglLog(_EGL_DEBUG, "Closing %s", drv->Name); - /* - * XXX check for currently bound context/surfaces and delete them? - */ + _eglReleaseDisplayResources(drv, dpy); b = drv->API.Terminate(drv, dpy); |