diff options
author | Jack Palevich <jackpal@google.com> | 2009-11-25 13:48:54 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-25 13:48:54 -0800 |
commit | 9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841 (patch) | |
tree | 22f00f90c4efac18e962bdeba071fd79227d259d /opengl | |
parent | c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa (diff) | |
parent | ca00dee21425882619aef4ecbe3e0d08de0544e5 (diff) | |
download | frameworks_base-9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841.zip frameworks_base-9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841.tar.gz frameworks_base-9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841.tar.bz2 |
am ca00dee2: Merge change I5aa3adcf into eclair
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2
* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
Improve the exception message text by including eglGetError().
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index df5f96e..8954ec6 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -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; |