drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2

Browse Source 
Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp

* commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76':
  Fix stupid bug in GLThreadManager implementation.
This commit is contained in:
Jack Palevich
2009-11-06 16:45:58 -08:00
committed by Android Git Automerger
parent a3c90d930e a3a351e5d1
commit e54f267f06
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opengl/java/android/opengl/GLSurfaceView.java
View File

@ -1299,9 +1299,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
GLThread oldThread = null; GLThread oldThread = null;
synchronized(this) { synchronized(this) {
mMostRecentGLThread = thread;
oldThread = mMostRecentGLThread; oldThread = mMostRecentGLThread;
mMostRecentGLThread = thread;
}
if (oldThread != null && ! mMultipleGLESContextsAllowed) {
synchronized(oldThread) {
oldThread.notifyAll();
}
}
synchronized(this) {
while ((! mMultipleGLESContextsAllowed) while ((! mMultipleGLESContextsAllowed)
&& mGLContextCount > 0) { && mGLContextCount > 0) {
wait(); wait();
@ -1309,12 +1316,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
mGLContextCount++; mGLContextCount++;
} }
if (oldThread != null && ! mMultipleGLESContextsAllowed) {
synchronized(oldThread) {
oldThread.notifyAll();
}
}
} }
public synchronized void end(GLThread thread) { public synchronized void end(GLThread thread) {