Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca00dee2: Merge change I5aa3adcf into eclair

Browse Source 
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2

* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
  Improve the exception message text by including eglGetError().
This commit is contained in:
Jack Palevich
2009-11-25 13:48:54 -08:00
committed by Android Git Automerger
parent c61b0de83b ca00dee214
commit 9c0b39c47e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opengl/java/android/opengl/GLSurfaceView.java
View File

@@ -880,7 +880,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");
}
/*
@@ -888,7 +888,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();
@@ -947,6 +947,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;