geode-sdk/android-launcher
1
0 Fork 1
mirror of https://github.com/geode-sdk/android-launcher.git synced 2026-10-26 09:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix surface update being called outside gl thread

Browse Source
This commit is contained in:
Chloe committed 2026-09-07 00:41:18 -07:00
1 parent 5718b73470
commit 1773e54c84
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/geode/launcher/ExplicitGLSurfaceView.java
+6 -3
View File
@@ -340,7 +340,6 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
* not normally called or subclassed by clients of GLSurfaceView.
*/
public void surfaceCreated(SurfaceHolder holder) {
LauncherFix.INSTANCE.setSurface(holder.getSurface());
mGLThread.surfaceCreated();
}
/**
@@ -348,7 +347,6 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
* not normally called or subclassed by clients of GLSurfaceView.
*/
public void surfaceDestroyed(SurfaceHolder holder) {
LauncherFix.INSTANCE.setSurface(null);
// Surface will be destroyed when we return
mGLThread.surfaceDestroyed();
}
@@ -357,7 +355,6 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
* not normally called or subclassed by clients of GLSurfaceView.
*/
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
LauncherFix.INSTANCE.setSurface(holder.getSurface());
mGLThread.onWindowResize(w, h);
}
/**
@@ -817,8 +814,12 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
if (view != null) {
mEglSurface = view.mEGLWindowSurfaceFactory.createWindowSurface(
mEglDisplay, mEglConfig, view.getHolder());
// NOTE: this diverges from GLSurfaceView
LauncherFix.INSTANCE.setSurface(view.getHolder().getSurface());
} else {
mEglSurface = null;
// NOTE: this diverges from GLSurfaceView
LauncherFix.INSTANCE.setSurface(null);
}
if (mEglSurface == null || mEglSurface == EGL14.EGL_NO_SURFACE) {
int error = EGL14.eglGetError();
@@ -847,6 +848,7 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
* @return the EGL error code from eglSwapBuffers.
*/
public int swap() {
// NOTE: this diverges from GLSurfaceView
// if (! EGL14.eglSwapBuffers(mEglDisplay, mEglSurface)) {
if (!LauncherFix.INSTANCE.swapFrame(mEglDisplay.getNativeHandle(), mEglSurface.getNativeHandle())) {
return EGL14.eglGetError();
@@ -1216,6 +1218,7 @@ public class ExplicitGLSurfaceView extends SurfaceView implements SurfaceHolder.
finishDrawingRunnable.run();
finishDrawingRunnable = null;
}
// NOTE: this diverges from GLSurfaceView
requestRender();
} finally {
// Trace.traceEnd(Trace.TRACE_TAG_VIEW);