Merge change I5aa3adcf into eclair (ca00dee2) · Commits · e / os / android_frameworks_base

opengl/java/android/opengl/GLSurfaceView.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
		mEglDisplay, mEglConfig, holder);

		if (mEglSurface == null \|\| mEglSurface == EGL10.EGL_NO_SURFACE) {
		throw new RuntimeException("createWindowSurface failed");
		throwEglException("createWindowSurface");
		}

		/*
		@@ -875,7 +875,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
		* the context is current and bound to a surface.
		*/
		if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
		throw new RuntimeException("eglMakeCurrent failed.");
		throwEglException("eglMakeCurrent");
		}

		GL gl = mEglContext.getGL();
		@@ -934,6 +934,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
		}
		}

		private void throwEglException(String function) {
		throw new RuntimeException(function + " failed: " + mEgl.eglGetError());
		}

		EGL10 mEgl;
		EGLDisplay mEglDisplay;
		EGLSurface mEglSurface;