Skip to content

Commit b3a39cd

Browse files
committed
disable angle backend
1 parent bee65b3 commit b3a39cd

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

FCLauncher/src/main/java/com/tungsten/fclauncher/FCLConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public enum Renderer implements Serializable {
1515
RENDERER_VGPU("VGPU:libvgpu.so:libEGL.so"),
1616
RENDERER_ZINK("Zink:libOSMesa_8.so:libEGL.so"),
1717
RENDERER_FREEDRENO("Freedreno:libOSMesa_8.so:libEGL.so"),
18-
RENDERER_GL4ESPLUS("GL4ES+:libgl4es_plus.so:libEGL_angle.so"),
18+
RENDERER_GL4ESPLUS("GL4ES+:libgl4es_plus.so:libEGL.so"),
1919
RENDERER_CUSTOM("Custom:libCustom.so:libEGL.so");
2020

2121
private final String glInfo;

FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,17 @@ private static void addRendererEnv(FCLConfig config, HashMap<String, String> env
222222
});
223223
return;
224224
}
225+
boolean useAngle = false;
225226
if (FCLBridge.BACKEND_IS_BOAT) {
226227
envMap.put("LIBGL_STRING", renderer.toString());
227228
envMap.put("LIBGL_NAME", renderer.getGlLibName());
228-
envMap.put("LIBEGL_NAME", renderer.getEglLibName());
229+
if (useAngle && renderer == FCLConfig.Renderer.RENDERER_GL4ESPLUS) {
230+
envMap.put("LIBEGL_NAME", "libEGL_angle.so");
231+
envMap.put("LIBGL_BACKEND_ANGLE", "1");
232+
} else {
233+
envMap.put("LIBEGL_NAME", renderer.getEglLibName());
234+
envMap.put("LIBGL_BACKEND_ANGLE", "0");
235+
}
229236
}
230237
if (renderer == FCLConfig.Renderer.RENDERER_GL4ES || renderer == FCLConfig.Renderer.RENDERER_VGPU) {
231238
envMap.put("LIBGL_ES", "2");
@@ -254,10 +261,9 @@ private static void addRendererEnv(FCLConfig config, HashMap<String, String> env
254261
envMap.put("LIBGL_SHADERCONVERTER", "1");
255262
envMap.put("LIBGL_GL", "21");
256263
envMap.put("LIBGL_USEVBO", "1");
257-
envMap.put("LIBGL_BACKEND_ANGLE", "1");
258264
if (!FCLBridge.BACKEND_IS_BOAT) {
259265
envMap.put("POJAV_RENDERER", "opengles3");
260-
envMap.put("POJAVEXEC_EGL", renderer.getEglLibName());
266+
envMap.put("POJAVEXEC_EGL", useAngle ? "libEGL_angle.so" : renderer.getEglLibName());
261267
}
262268
} else {
263269
envMap.put("MESA_GLSL_CACHE_DIR", config.getContext().getCacheDir().getAbsolutePath());

0 commit comments

Comments
 (0)