Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b01450b7 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: move EGL termination into RE 

This defers EGL termination a bit but that should be fine.  More
importantly, SurfaceFlinger is never destructed.

Test: SurfaceFlinger_test
Change-Id: I200e2169eb1cc419a587a7626b438d3d5ddedc70
parent d4d9c6fc

services/surfaceflinger/RenderEngine/RenderEngine.cpp

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ RenderEngine::RenderEngine() : mEGLDisplay(EGL_NO_DISPLAY), mEGLConfig(NULL), 
}



RenderEngine::~RenderEngine() {

    eglMakeCurrent(mEGLDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

    eglTerminate(mEGLDisplay);

}



void RenderEngine::setEGLHandles(EGLDisplay display, EGLConfig config, EGLContext ctxt) {

services/surfaceflinger/SurfaceFlinger.cpp

+0 −3
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ void SurfaceFlinger::onFirstRef() 


SurfaceFlinger::~SurfaceFlinger()

{

    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

    eglTerminate(display);

}



void SurfaceFlinger::binderDied(const wp<IBinder>& /* who */)