stuff 3

Author: igagis

src/ruisapp/glue/android/window.cxx

@@ -62,7 +62,7 @@ void native_window::bind_rendering_context()
 			if (!this->egl_dummy_surface.has_value()) {
 				this->egl_dummy_surface.emplace(
 					this->egl_display, //
-					egl_config
+					this->egl_config
 				);
 			}
 			eglMakeCurrent(

src/ruisapp/glue/linux/wayland/window.hxx

@@ -43,9 +43,11 @@ class native_window : public ruis::render::native_window
 	wayland_egl_window_wrapper wayland_egl_window;
 
 	egl_config_wrapper egl_config;
-	egl_surface_wrapper egl_surface;
 	egl_context_wrapper egl_context;
 
+	std::optional<egl_pbuffer_surface_wrapper> egl_dummy_surface;
+	std::optional<egl_surface_wrapper> egl_surface;
+
 	wayland_surface_wrapper::scale_and_dpi scale_and_dpi;
 
 public:
@@ -91,11 +93,6 @@ public:
 			gl_version,
 			window_params
 		),
-		egl_surface(
-			this->display.get().egl_display, //
-			this->egl_config,
-			this->wayland_egl_window.window
-		),
 		egl_context(
 			this->display.get().egl_display, //
 			gl_version,
@@ -125,21 +122,59 @@ public:
 		return this->wayland_surface.surface;
 	}
 
+	void create_egl_surface()
+	{
+		this->egl_surface.emplace(
+			this->display.get().egl_display, //
+			this->egl_config,
+			this->wayland_egl_window.window
+		);
+	}
+
 	void swap_frame_buffers() override
 	{
-		this->egl_surface.swap_frame_buffers();
+		if (this->egl_surface.has_value()) {
+			this->egl_surface.value().swap_frame_buffers();
+		}
 	}
 
 	void bind_rendering_context() override
 	{
-		if (eglMakeCurrent(
-				this->display.get().egl_display.display,
-				this->egl_surface.surface,
-				this->egl_surface.surface,
-				this->egl_context.context
-			) == EGL_FALSE)
-		{
-			throw std::runtime_error("eglMakeCurrent() failed");
+		auto& egl_display = this->display.get().egl_display;
+
+		if (this->egl_surface.has_value()) {
+			if (eglMakeCurrent(
+					egl_display.display,
+					this->egl_surface.value().surface,
+					this->egl_surface.value().surface,
+					this->egl_context.context
+				) == EGL_FALSE)
+			{
+				throw std::runtime_error("eglMakeCurrent() failed");
+			}
+		} else {
+			if (egl_display.extensions.get(egl::extension::khr_surfaceless_context)) {
+				eglMakeCurrent(
+					egl_display.display, //
+					EGL_NO_SURFACE,
+					EGL_NO_SURFACE,
+					this->egl_context.context
+				);
+			} else {
+				// KHR_surfaceless_context EGL extension is not available, create a dummy pbuffer surface to make the context current
+				if (!this->egl_dummy_surface.has_value()) {
+					this->egl_dummy_surface.emplace(
+						egl_display, //
+						this->egl_config
+					);
+				}
+				eglMakeCurrent(
+					egl_display.display, //
+					this->egl_dummy_surface.value().surface,
+					this->egl_dummy_surface.value().surface,
+					this->egl_context.context
+				);
+			}
 		}
 	}
 

src/ruisapp/glue/linux/wayland/xdg_surface.cxx

@@ -42,12 +42,19 @@ void xdg_surface_wrapper::xdg_surface_configure(
 		o << "xgd_surface: CONFIGURE for surface id = " << id << std::endl;
 	});
 
-    // Wayland protocol requires to acknowledge the configure event
+	// Wayland protocol requires to acknowledge the configure event
 	xdg_surface_ack_configure(
 		surface, //
 		serial
 	);
 
+	// The configure callback is invoked by Wayland after initial toplevel configure has been invoked.
+	// Right after creating a Wayland surface, according to the Wayland protocol, it
+	// should do the initial configure call, after which one is supposed to do the
+	// initial surface commit. In case of EGL we have to call eglSwapBuffers(), which will do the
+	// surface commit for us. This makes the surface to be mapped to the screen and become visible.
+	// If this sequence is not honored the surface will not appear on the screen.
+
 	auto& glue = get_glue();
 
 	auto window = glue.get_window(self.wayland_surface.surface);
@@ -58,12 +65,14 @@ void xdg_surface_wrapper::xdg_surface_configure(
 	}
 
 	auto& win = *window;
-    auto& natwin = win.ruis_native_window.get();
+	auto& natwin = win.ruis_native_window.get();
+
+	natwin.create_egl_surface();
 
 	// swap EGL frame buffers with the window's EGL context made current
 	win.gui.context.get().ren().ctx().apply([&]() {
 		natwin.swap_frame_buffers();
 	});
 
-	self.wayland_surface.commit();
+	// self.wayland_surface.commit();
 }

src/ruisapp/glue/linux/wayland/xdg_toplevel.cxx

@@ -157,22 +157,8 @@ void xdg_toplevel_wrapper::xdg_toplevel_configure(
 	// if both width and height are zero, then it is a state change
 	if (width == 0 && height == 0) {
 		if (states_span.empty()) {
-			// The configure callback is invoked with both dimensions 0
-			// and no any state changes. This means that it is an initial configure call.
-			// Right after creating a Wayland surface, according to the Wayland protocol, it
-			// should do the initial configure call, after which one is supposed to do the
-			// initial surface commit. In case of EGL we have to call eglSwapBuffers(), which will do the
-			// surface commit for us. This makes the surface to be mapped to the screen and become visible.
-			// If this sequence is not honored the surface will not appear on the screen.
-
 			utki::logcat_debug("  initial configure call", '\n');
 
-			// swap EGL frame buffers with the window's EGL context made current
-			// win.gui.context.get().ren().ctx().apply([&]() {
-			// 	natwin.swap_frame_buffers();
-			// });
-
-			// self.wayland_surface.commit();
 			return;
 		}