diff options
| author | Jack Palevich <jackpal@google.com> | 2012-03-22 11:47:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-22 11:47:30 -0700 |
| commit | f7f4c20605badb95f99e3f1f609458a9e4fe0c1a (patch) | |
| tree | 099c7ac8f5777c3ee7d00849804bdcd70dd92c58 /opengl | |
| parent | 2ffead9cf2cb57d21929c354e547a428b8be54d2 (diff) | |
| parent | 8b854cd74bd29b6bb0b4c681490a3a97b1739289 (diff) | |
| download | frameworks_base-f7f4c20605badb95f99e3f1f609458a9e4fe0c1a.zip frameworks_base-f7f4c20605badb95f99e3f1f609458a9e4fe0c1a.tar.gz frameworks_base-f7f4c20605badb95f99e3f1f609458a9e4fe0c1a.tar.bz2 | |
Merge "Remove EGL context limit for Adreno GPUs."
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 d9501a2..f69fc53 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -1845,7 +1845,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback ! renderer.startsWith(kMSM7K_RENDERER_PREFIX); notifyAll(); } - mLimitedGLESContexts = !mMultipleGLESContextsAllowed || renderer.startsWith(kADRENO); + mLimitedGLESContexts = !mMultipleGLESContextsAllowed; if (LOG_SURFACE) { Log.w(TAG, "checkGLDriver renderer = \"" + renderer + "\" multipleContextsAllowed = " + mMultipleGLESContextsAllowed @@ -1871,6 +1871,11 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } } + /** + * This check was required for some pre-Android-3.0 hardware. Android 3.0 provides + * support for hardware-accelerated views, therefore multiple EGL contexts are + * supported on all Android 3.0+ EGL drivers. + */ private boolean mGLESVersionCheckComplete; private int mGLESVersion; private boolean mGLESDriverCheckComplete; @@ -1879,7 +1884,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback private static final int kGLES_20 = 0x20000; private static final String kMSM7K_RENDERER_PREFIX = "Q3Dimension MSM7500 "; - private static final String kADRENO = "Adreno"; private GLThread mEglOwner; } |