diff options
| author | Jack Palevich <jackpal@google.com> | 2009-11-06 16:45:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 16:45:58 -0800 |
| commit | e54f267f06e86f9c1248742fc56967355721a4e7 (patch) | |
| tree | 5c9afbd9db7305b1e2435e0d97a67b9e9ba8bf7e /opengl/java/android | |
| parent | a3c90d930ebabcfffd9d4d7715ad1329e1f8c2d8 (diff) | |
| parent | a3a351e5d164d0c8b461ae7af86edc0227654a76 (diff) | |
| download | frameworks_base-e54f267f06e86f9c1248742fc56967355721a4e7.zip frameworks_base-e54f267f06e86f9c1248742fc56967355721a4e7.tar.gz frameworks_base-e54f267f06e86f9c1248742fc56967355721a4e7.tar.bz2 | |
am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2
Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp
* commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76':
Fix stupid bug in GLThreadManager implementation.
Diffstat (limited to 'opengl/java/android')
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index cbe5be4..f11123e 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -1299,9 +1299,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback GLThread oldThread = null; synchronized(this) { - mMostRecentGLThread = thread; oldThread = mMostRecentGLThread; + mMostRecentGLThread = thread; + } + if (oldThread != null && ! mMultipleGLESContextsAllowed) { + synchronized(oldThread) { + oldThread.notifyAll(); + } + } + synchronized(this) { while ((! mMultipleGLESContextsAllowed) && mGLContextCount > 0) { wait(); @@ -1309,12 +1316,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mGLContextCount++; } - - if (oldThread != null && ! mMultipleGLESContextsAllowed) { - synchronized(oldThread) { - oldThread.notifyAll(); - } - } } public synchronized void end(GLThread thread) { |