Merge "Add extra EGL error checking" into jb-mr1-dev (82f385a3) · Commits · e / os / android_frameworks_base

core/java/android/view/HardwareRenderer.java

+14 −8

Original line number	Diff line number	Diff line
		@@ -733,6 +733,11 @@ public abstract class HardwareRenderer {
		*/
		void checkEglErrors() {
		if (isEnabled()) {
		checkEglErrorsForced();
		}
		}

		private void checkEglErrorsForced() {
		int error = sEgl.eglGetError();
		if (error != EGL_SUCCESS) {
		// something bad has happened revert to
		@@ -741,7 +746,6 @@ public abstract class HardwareRenderer {
		fallback(error != EGL11.EGL_CONTEXT_LOST);
		}
		}
		}

		private void fallback(boolean fallback) {
		destroy(true);
		@@ -813,6 +817,8 @@ public abstract class HardwareRenderer {
		GLUtils.getEGLErrorString(sEgl.eglGetError()));
		}

		checkEglErrorsForced();

		sEglConfig = chooseEglConfig();
		if (sEglConfig == null) {
		// We tried to use EGL_SWAP_BEHAVIOR_PRESERVED_BIT, try again without