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

Commit cee059dc authored by Jack Palevich's avatar Jack Palevich
Browse files

Improve GLSurfaceView Pausing. 

When pausing we want to do three separate things, in order:

 + release the EGL surface
 + optionally release the EGL context
 + optionally terminate Egl

Previously we would only do these things if we had an EGL surface. But
it is possible that we don't have an EGL Surface, but still have an EGL
context. And in that situation we still want to release the EGL context.

Now we check the preconditions for the three cases separately.

Bug: 6338235
Change-Id: I804683b3d5c136cc98ea3f5051067eea18152ddf
parent 6e0ac89f

opengl/java/android/opengl/GLSurfaceView.java

+12 −2
Original line number Diff line number Diff line
@@ -1298,7 +1298,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                            }



                            // Update the pause state.

                            boolean pausing = false;

                            if (mPaused != mRequestPaused) {

                                pausing = mRequestPaused;

                                mPaused = mRequestPaused;

                                sGLThreadManager.notifyAll();

                                if (LOG_PAUSE_RESUME) {
@@ -1324,12 +1326,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                                lostEglContext = false;

                            }



                            // Do we need to release the EGL surface?

                            if (mHaveEglSurface && mPaused) {

                            // When pausing, release the EGL surface:

                            if (pausing && mHaveEglSurface) {

                                if (LOG_SURFACE) {

                                    Log.i("GLThread", "releasing EGL surface because paused tid=" + getId());

                                }

                                stopEglSurfaceLocked();

                            }



                            // When pausing, optionally release the EGL Context:

                            if (pausing && mHaveEglContext) {

                                GLSurfaceView view = mGLSurfaceViewWeakRef.get();

                                boolean preserveEglContextOnPause = view == null ?

                                        false : view.mPreserveEGLContextOnPause;
@@ -1339,6 +1345,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                                        Log.i("GLThread", "releasing EGL context because paused tid=" + getId());

                                    }

                                }

                            }



                            // When pausing, optionally terminate EGL:

                            if (pausing) {

                                if (sGLThreadManager.shouldTerminateEGLWhenPausing()) {

                                    mEglHelper.finish();

                                    if (LOG_SURFACE) {