diff options
| author | Romain Guy <romainguy@google.com> | 2012-09-17 18:20:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-17 18:20:55 -0700 |
| commit | 82f385a372329b767876ace2b3715a2d8ec13221 (patch) | |
| tree | 5424736471d02f99b8c2e456c9ea042112786831 /core/java | |
| parent | 2bb25cd57ae540160fa2fff2b929b68c448423a9 (diff) | |
| parent | 740ee65d460401c266a7108c9aa4c6e7fbe58489 (diff) | |
| download | frameworks_base-82f385a372329b767876ace2b3715a2d8ec13221.zip frameworks_base-82f385a372329b767876ace2b3715a2d8ec13221.tar.gz frameworks_base-82f385a372329b767876ace2b3715a2d8ec13221.tar.bz2 | |
Merge "Add extra EGL error checking" into jb-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index f906e24..446a51e 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -733,13 +733,17 @@ public abstract class HardwareRenderer { */ void checkEglErrors() { if (isEnabled()) { - int error = sEgl.eglGetError(); - if (error != EGL_SUCCESS) { - // something bad has happened revert to - // normal rendering. - Log.w(LOG_TAG, "EGL error: " + GLUtils.getEGLErrorString(error)); - fallback(error != EGL11.EGL_CONTEXT_LOST); - } + checkEglErrorsForced(); + } + } + + private void checkEglErrorsForced() { + int error = sEgl.eglGetError(); + if (error != EGL_SUCCESS) { + // something bad has happened revert to + // normal rendering. + Log.w(LOG_TAG, "EGL error: " + GLUtils.getEGLErrorString(error)); + fallback(error != EGL11.EGL_CONTEXT_LOST); } } @@ -812,7 +816,9 @@ public abstract class HardwareRenderer { throw new RuntimeException("eglInitialize failed " + GLUtils.getEGLErrorString(sEgl.eglGetError())); } - + + checkEglErrorsForced(); + sEglConfig = chooseEglConfig(); if (sEglConfig == null) { // We tried to use EGL_SWAP_BEHAVIOR_PRESERVED_BIT, try again without |