| Chunk |
|---|
| Conflicting content |
|---|
while ((! mMultipleGLESContextsAllowed)
&& mGLContextCount > 0) {
wait();
}
mGLContextCount++;
=======
mMostRecentGLThread = thread;
>>>>>>> 4e3fadd0c99d2774709a067e017d8fd622440f0e
}
if (oldThread != null && ! mMultipleGLESContextsAllowed) {
GLThread oldThread = null;
synchronized(this) {
oldThread = mMostRecentGLThread;
<<<<<<< HEAD |
| Solution content |
|---|
GLThread oldThread = null;
synchronized(this) {
oldThread = mMostRecentGLThread;
mMostRecentGLThread = thread;
}
if (oldThread != null && ! mMultipleGLESContextsAllowed) {
synchronized(oldThread) {
oldThread.notifyAll();
}
}
synchronized(this) {
while ((! mMultipleGLESContextsAllowed)
&& mGLContextCount > 0) {
wait();
}
mGLContextCount++;
}
}
public synchronized void end(GLThread thread) {
mGLContextCount--;
notifyAll();
if (mMostRecentGLThread == thread) {
mMostRecentGLThread = null;
}
}
public synchronized void checkGLDriver(GL10 gl) {
if (! mGLESDriverCheckComplete) {
if (mGLESVersion < kGLES_20) {
String renderer = gl.glGetString(GL10.GL_RENDERER);
mMultipleGLESContextsAllowed =
! renderer.startsWith(kMSM7K_RENDERER_PREFIX);
public boolean shouldQuit(GLThread thread) {
synchronized(this) {
return thread != mMostRecentGLThread;
}
}
private boolean mGLESVersionCheckComplete;
private int mGLESVersion;
private GLThread mMostRecentGLThread;
private boolean mGLESDriverCheckComplete;
private boolean mMultipleGLESContextsAllowed;
private int mGLContextCount;
private static final int kGLES_20 = 0x20000;
private boolean mSizeChanged = true;
private GLThread mGLThread;
private EGLConfigChooser mEGLConfigChooser;
private EGLContextFactory mEGLContextFactory;
private int mDebugFlags;
}
private static final String kMSM7K_RENDERER_PREFIX =
"Q3Dimension MSM7500 ";
};
private static final GLThreadManager sGLThreadManager = new GLThreadManager();
notifyAll();
}
mGLESDriverCheckComplete = true;
}
}
private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory;
private GLWrapper mGLWrapper; |
| File |
|---|
| GLSurfaceView.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Variable |
| While statement |