Unify and clean-up Godot Android surface allocation and render thread logic

Author: m4gr3d

platform/android/SCsub

@@ -23,7 +23,6 @@ android_files = [
     "java_godot_lib_jni.cpp",
     "java_class_wrapper.cpp",
     "java_godot_wrapper.cpp",
-    "java_godot_view_wrapper.cpp",
     "java_godot_io_wrapper.cpp",
     "jni_utils.cpp",
     "android_keys_utils.cpp",

platform/android/display_server_android.cpp

@@ -36,6 +36,7 @@
 #include "tts_android.h"
 
 #include "core/config/project_settings.h"
+#include "main/main.h"
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
@@ -703,6 +704,9 @@ void DisplayServerAndroid::reset_window() {
 		}
 	}
 #endif
+
+	// We force redraw to ensure we render at least once when the window is reset.
+	Main::force_redraw();
 }
 
 void DisplayServerAndroid::notify_surface_changed(int p_width, int p_height) {
@@ -837,23 +841,23 @@ void DisplayServerAndroid::_mouse_update_mode() {
 			? mouse_mode_override
 			: mouse_mode_base;
 
-	if (!OS_Android::get_singleton()->get_godot_java()->get_godot_view()->can_update_pointer_icon() || !OS_Android::get_singleton()->get_godot_java()->get_godot_view()->can_capture_pointer()) {
+	if (!OS_Android::get_singleton()->get_godot_java()->can_capture_pointer()) {
 		return;
 	}
 	if (mouse_mode == wanted_mouse_mode) {
 		return;
 	}
 
 	if (wanted_mouse_mode == MouseMode::MOUSE_MODE_HIDDEN) {
-		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->set_pointer_icon(CURSOR_TYPE_NULL);
+		OS_Android::get_singleton()->get_godot_java()->set_pointer_icon(CURSOR_TYPE_NULL);
 	} else {
 		cursor_set_shape(cursor_shape);
 	}
 
 	if (wanted_mouse_mode == MouseMode::MOUSE_MODE_CAPTURED) {
-		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->request_pointer_capture();
+		OS_Android::get_singleton()->get_godot_java()->request_pointer_capture();
 	} else {
-		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->release_pointer_capture();
+		OS_Android::get_singleton()->get_godot_java()->release_pointer_capture();
 	}
 
 	mouse_mode = wanted_mouse_mode;
@@ -903,17 +907,14 @@ BitField<MouseButtonMask> DisplayServerAndroid::mouse_get_button_state() const {
 }
 
 void DisplayServerAndroid::_cursor_set_shape_helper(CursorShape p_shape, bool force) {
-	if (!OS_Android::get_singleton()->get_godot_java()->get_godot_view()->can_update_pointer_icon()) {
-		return;
-	}
 	if (cursor_shape == p_shape && !force) {
 		return;
 	}
 
 	cursor_shape = p_shape;
 
 	if (mouse_mode == MouseMode::MOUSE_MODE_VISIBLE || mouse_mode == MouseMode::MOUSE_MODE_CONFINED) {
-		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->set_pointer_icon(android_cursors[cursor_shape]);
+		OS_Android::get_singleton()->get_godot_java()->set_pointer_icon(android_cursors[cursor_shape]);
 	}
 }
 
@@ -932,7 +933,7 @@ void DisplayServerAndroid::cursor_set_custom_image(const Ref<Resource> &p_cursor
 	if (!cursor_path.is_empty()) {
 		cursor_path = ProjectSettings::get_singleton()->globalize_path(cursor_path);
 	}
-	OS_Android::get_singleton()->get_godot_java()->get_godot_view()->configure_pointer_icon(android_cursors[cursor_shape], cursor_path, p_hotspot);
+	OS_Android::get_singleton()->get_godot_java()->configure_pointer_icon(android_cursors[cursor_shape], cursor_path, p_hotspot);
 	_cursor_set_shape_helper(p_shape, true);
 }
 
@@ -953,16 +954,24 @@ DisplayServer::VSyncMode DisplayServerAndroid::window_get_vsync_mode(WindowID p_
 	return DisplayServer::VSYNC_ENABLED;
 }
 
-void DisplayServerAndroid::reset_swap_buffers_flag() {
-	swap_buffers_flag = false;
-}
+void DisplayServerAndroid::release_rendering_thread() {
+	if (egl_current_window_id == INVALID_WINDOW_ID) {
+		return;
+	}
 
-bool DisplayServerAndroid::should_swap_buffers() const {
-	return swap_buffers_flag;
+	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
+	ERR_FAIL_NULL(godot_java);
+	godot_java->release_current_gl_window(egl_current_window_id);
 }
 
 void DisplayServerAndroid::swap_buffers() {
-	swap_buffers_flag = true;
+	if (egl_current_window_id == INVALID_WINDOW_ID) {
+		return;
+	}
+
+	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
+	ERR_FAIL_NULL(godot_java);
+	godot_java->egl_swap_buffers(egl_current_window_id);
 }
 
 void DisplayServerAndroid::set_native_icon(const String &p_filename) {
@@ -976,3 +985,18 @@ void DisplayServerAndroid::set_icon(const Ref<Image> &p_icon) {
 bool DisplayServerAndroid::is_window_transparency_available() const {
 	return GLOBAL_GET_CACHED(bool, "display/window/per_pixel_transparency/allowed");
 }
+
+void DisplayServerAndroid::gl_window_make_current(DisplayServer::WindowID p_window_id) {
+	if (p_window_id == INVALID_WINDOW_ID) {
+		return;
+	}
+
+	if (egl_current_window_id == p_window_id) {
+		return;
+	}
+
+	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
+	ERR_FAIL_NULL(godot_java);
+	godot_java->make_gl_window_current(p_window_id);
+	egl_current_window_id = p_window_id;
+}

platform/android/display_server_android.h

@@ -71,7 +71,7 @@ class DisplayServerAndroid : public DisplayServer {
 	void _mouse_update_mode();
 
 	bool keep_screen_on;
-	bool swap_buffers_flag;
+	WindowID egl_current_window_id = MAIN_WINDOW_ID;
 
 	CursorShape cursor_shape = CursorShape::CURSOR_ARROW;
 
@@ -249,15 +249,16 @@ class DisplayServerAndroid : public DisplayServer {
 	virtual Point2i mouse_get_position() const override;
 	virtual BitField<MouseButtonMask> mouse_get_button_state() const override;
 
-	void reset_swap_buffers_flag();
-	bool should_swap_buffers() const;
+	virtual void release_rendering_thread() override;
 	virtual void swap_buffers() override;
 
 	virtual void set_native_icon(const String &p_filename) override;
 	virtual void set_icon(const Ref<Image> &p_icon) override;
 
 	virtual bool is_window_transparency_available() const override;
 
+	virtual void gl_window_make_current(WindowID p_window_id) override;
+
 	DisplayServerAndroid(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerAndroid();
 };

platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt

@@ -316,7 +316,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 		runOnUiThread {
 			// Enable long press, panning and scaling gestures
-			godotFragment?.godot?.renderView?.inputHandler?.apply {
+			godotFragment?.godot?.godotInputHandler?.apply {
 				enableLongPress(longPressEnabled)
 				enablePanningAndScalingGestures(panScaleEnabled)
 				setOverrideVolumeButtons(overrideVolumeButtonsEnabled)