diff options
| author | Jack Palevich <jackpal@google.com> | 2009-11-06 16:56:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 16:56:32 -0800 |
| commit | 6518c2bab4e336a08e703018accdf7d5e6a6a1ad (patch) | |
| tree | 11d67241d53ce71bba2b30055e4e79e812ce7122 /opengl/java | |
| parent | 790c4294da25a9d935ed9a520f9ca3d20a48790f (diff) | |
| parent | e54f267f06e86f9c1248742fc56967355721a4e7 (diff) | |
| download | frameworks_base-6518c2bab4e336a08e703018accdf7d5e6a6a1ad.zip frameworks_base-6518c2bab4e336a08e703018accdf7d5e6a6a1ad.tar.gz frameworks_base-6518c2bab4e336a08e703018accdf7d5e6a6a1ad.tar.bz2 | |
am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2
Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7'
* commit 'e54f267f06e86f9c1248742fc56967355721a4e7':
Fix stupid bug in GLThreadManager implementation.
Diffstat (limited to 'opengl/java')
| -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) { |