Auto-merge pull request #7585 from livecodeian/bugfix-23237

livecode-vulcan · web-flow · commit 730fca22b57b · 2021-06-30T10:56:46.000+03:00
[[ Bug 23237 ]] Ensure Android EGL configuration supports GLES 3.x This patch updates the android OpenGLView class to request an EGL configuration that supports GLES 3.x. This prevents a crash in the Android x86 emulator when attempting to use gl functions that are not supported by the default configuration. Fixes https://quality.livecode.com/show_bug.cgi?id=23237
diff --git a/docs/notes/bugfix-23237.md b/docs/notes/bugfix-23237.md
@@ -0,0 +1 @@
+# Fix crash when using acceleratedRendering on Android x86 emulator
diff --git a/engine/src/java/com/runrev/android/OpenGLView.java b/engine/src/java/com/runrev/android/OpenGLView.java
@@ -35,6 +35,7 @@ public class OpenGLView extends SurfaceView implements SurfaceHolder.Callback
 	// Instance variables
 	
 	private static final int EGL_CONTEXT_CLIENT_VERSION = 0x00003098;
+	private static final int EGL_OPENGL_ES3_BIT = 0x00000040;
 	
 	private EGL10 m_egl;
 	private EGLDisplay m_egl_display;
@@ -78,6 +79,7 @@ private EGLConfig findConfig(int r, int g, int b, int a)
 	{
 		int[] t_config_spec;
 		t_config_spec = new int[] {
+			EGL10 . EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT,
 			EGL10 . EGL_RED_SIZE, r,
 			EGL10 . EGL_GREEN_SIZE, g,
 			EGL10 . EGL_BLUE_SIZE, b,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when using acceleratedRendering on Android x86 emulator`