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

am 85a9498a: am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclair

Browse Source 
Merge commit '85a9498a2f33d62a4313a3561b5468456974696e'

* commit '85a9498a2f33d62a4313a3561b5468456974696e':
  Improve the exception message text by including eglGetError().
This commit is contained in:
Jack Palevich
2009-11-25 14:12:04 -08:00
committed by Android Git Automerger
parent 54b9a7c9f1 85a9498a2f
commit 6a9a87da47
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

@@ -935,7 +935,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");
}
/*
@@ -943,7 +943,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();
@@ -1002,6 +1002,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;