atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor SurfaceViewWidget for frame_callback in the Wayland server

Browse Source 
SurfaceViewWidget is now always a child of a GtkGraphicsOffload and
handles the GdkTexture on its own. This way the extra GtkPicture is no
longer needed and also the frame_callback of the Wayland server can be
implemented.
This commit is contained in:
Julian Winkler
2024-11-17 16:42:47 +01:00
parent 58f29b7ba2
commit 4b36bca4c6
5 changed files with 132 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libandroid/native_window.c
View File

@@ -283,7 +283,7 @@ ANativeWindow * ANativeWindow_fromSurface(JNIEnv* env, jobject surface)
.global_remove = wl_registry_global_remove_handler
};
GtkWidget *surface_view_widget = _PTR(_GET_LONG_FIELD(surface, "widget"));
GtkWidget *surface_view_widget = gtk_widget_get_first_child(_PTR(_GET_LONG_FIELD(surface, "widget")));
GtkWidget *window = GTK_WIDGET(gtk_widget_get_native(surface_view_widget));
while( (width = gtk_widget_get_width(surface_view_widget)) == 0 ) {
// FIXME: UGLY: this loop waits until the SurfaceView widget gets mapped
@@ -312,13 +312,6 @@ ANativeWindow * ANativeWindow_fromSurface(JNIEnv* env, jobject surface)
GdkDisplay *display = gtk_root_get_display(GTK_ROOT(window));
if (!getenv("ATL_DIRECT_EGL")) {
GtkWidget *graphics_offload = gtk_widget_get_first_child(surface_view_widget);
if (!GTK_IS_GRAPHICS_OFFLOAD(graphics_offload)) {
graphics_offload = gtk_graphics_offload_new(gtk_picture_new());
gtk_widget_insert_after(graphics_offload, surface_view_widget, NULL);
}
GtkPicture *gtk_picture = GTK_PICTURE(gtk_graphics_offload_get_child(GTK_GRAPHICS_OFFLOAD(graphics_offload)));
if (!wl_compositor) {
if (!wl_display_client)
wl_display_client = wayland_server_start();
@@ -328,10 +321,10 @@ ANativeWindow * ANativeWindow_fromSurface(JNIEnv* env, jobject surface)
printf("XXX: wl_compositor: %p\n", wl_compositor);
}
struct wl_surface *wayland_surface = wl_compositor_create_surface(wl_compositor);
// transfer the GtkPicture pointer to the wayland server abusing the set_buffer_scale and set_buffer_transform methods
g_object_ref(gtk_picture);
wl_surface_set_buffer_scale(wayland_surface, _INTPTR(gtk_picture));
wl_surface_set_buffer_transform(wayland_surface, _INTPTR(gtk_picture)>>32);
// transfer the SurfaceViewWidget pointer to the wayland server abusing the set_buffer_scale and set_buffer_transform methods
g_object_ref(surface_view_widget);
wl_surface_set_buffer_scale(wayland_surface, _INTPTR(surface_view_widget));
wl_surface_set_buffer_transform(wayland_surface, _INTPTR(surface_view_widget)>>32);
struct wl_egl_window *egl_window = wl_egl_window_create(wayland_surface, width, height);
native_window->egl_window = (EGLNativeWindowType)egl_window;
native_window->wayland_display = wl_display_client;

71
src/libandroid/wayland_server.c
View File

@@ -7,13 +7,15 @@
#include <gdk/wayland/gdkwayland.h>
#include "../api-impl-jni/defines.h"
#include "../api-impl-jni/widgets/android_view_SurfaceView.h"
static EGLDisplay egl_display_gtk = NULL;
static GdkGLContext *gl_context_gtk = NULL;
static struct wl_event_loop *event_loop = NULL;
static GMutex mutex;
static PFNEGLQUERYWAYLANDBUFFERWL eglQueryWaylandBufferWL = NULL;
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = NULL;
static GMutex mutex; // synchronize access to wl_display_server
static struct wl_display *wl_display_server;
/* runs on main thread */
static gboolean delete_texture(void *data) {
@@ -26,7 +28,7 @@ static gboolean delete_texture(void *data) {
struct _BufferData {
GObject parent;
gboolean destroyed;
GtkPicture *picture;
SurfaceViewWidget *surface_view_widget;
struct wl_resource *wl_buffer;
GdkGLTextureBuilder *texture_builder;
};
@@ -39,7 +41,7 @@ static void buffer_data_dispose(GObject *g_object)
g_idle_add(delete_texture, _PTR(texture_id));
g_object_unref(buffer->texture_builder);
}
g_object_unref(buffer->picture);
g_object_unref(buffer->surface_view_widget);
}
static void buffer_data_class_init(BufferDataClass *cls)
{
@@ -50,13 +52,15 @@ G_DEFINE_TYPE(BufferData, buffer_data, G_TYPE_OBJECT)
struct surface {
struct wl_resource *wl_surface;
GtkPicture *picture;
SurfaceViewWidget *surface_view_widget;
struct wl_resource *frame_callback;
struct wl_event_source *frame_timer;
BufferData *buffers[3];
};
/* runs on main thread */
static void destroy_texture(void *data) {
static void destroy_texture(void *data)
{
BufferData *buffer = ATL_BUFFER_DATA(data);
g_mutex_lock(&mutex);
if (!buffer->destroyed) {
@@ -67,7 +71,23 @@ static void destroy_texture(void *data) {
}
/* runs on main thread */
static gboolean render_texture(void *data) {
static void draw_callback(SurfaceViewWidget *surface_view_widget)
{
g_mutex_lock(&mutex);
struct surface *surface = surface_view_widget->frame_callback_data;
if (surface && surface->frame_callback) {
wl_callback_send_done(surface->frame_callback, g_get_monotonic_time()/1000);
wl_resource_destroy(surface->frame_callback);
surface->frame_callback = NULL;
wl_event_source_timer_update(surface->frame_timer, 0);
wl_display_flush_clients(wl_display_server);
}
g_mutex_unlock(&mutex);
}
/* runs on main thread */
static gboolean render_texture(void *data)
{
BufferData *buffer = ATL_BUFFER_DATA(data);
if (!buffer->texture_builder) {
g_mutex_lock(&mutex);
@@ -98,8 +118,7 @@ static gboolean render_texture(void *data) {
GdkTexture *texture = gdk_gl_texture_builder_build(buffer->texture_builder, destroy_texture, buffer);
gtk_picture_set_paintable(buffer->picture, GDK_PAINTABLE(texture));
g_object_unref(texture);
surface_view_widget_set_texture(buffer->surface_view_widget, texture);
return G_SOURCE_REMOVE;
}
@@ -126,14 +145,20 @@ static void surface_attach(struct wl_client *client, struct wl_resource *resourc
g_object_unref(buffer);
buffer = g_object_new(buffer_data_get_type(), NULL);
buffer->wl_buffer = wl_buffer;
buffer->picture = g_object_ref(surface->picture);
buffer->surface_view_widget = g_object_ref(surface->surface_view_widget);
surface->buffers[0] = buffer;
}
static void surface_frame(struct wl_client *client, struct wl_resource *resource, uint32_t callback)
{
struct surface *surface = wl_resource_get_user_data(resource);
if (surface->frame_callback)
wl_resource_destroy(surface->frame_callback);
surface->frame_callback = wl_resource_create(client, &wl_callback_interface, 1, callback);
surface->surface_view_widget->frame_callback = draw_callback;
surface->surface_view_widget->frame_callback_data = surface;
// this timer is required in case the main thread and the wayland server thread deadlock each other waiting for the next frame_callback
wl_event_source_timer_update(surface->frame_timer, 1000/20);
}
static void surface_damage(struct wl_client *client, struct wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height)
@@ -142,9 +167,12 @@ static void surface_damage(struct wl_client *client, struct wl_resource *resourc
static int frame_timer(void *data)
{
struct wl_resource *frame_callback = data;
wl_callback_send_done(frame_callback, g_get_monotonic_time()/1000);
wl_resource_destroy(frame_callback);
struct surface *surface = data;
if (surface->frame_callback) {
wl_callback_send_done(surface->frame_callback, g_get_monotonic_time()/1000);
wl_resource_destroy(surface->frame_callback);
surface->frame_callback = NULL;
}
return 0;
}
@@ -152,8 +180,6 @@ static void surface_commit(struct wl_client *client, struct wl_resource *resourc
{
struct surface *surface = wl_resource_get_user_data(resource);
g_idle_add(render_texture, g_object_ref(surface->buffers[0]));
struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, frame_timer, surface->frame_callback);
wl_event_source_timer_update(timer, 1000/60);
}
static void surface_destroy(struct wl_client *client, struct wl_resource *resource) {
@@ -162,8 +188,14 @@ static void surface_destroy(struct wl_client *client, struct wl_resource *resour
surface->buffers[i]->destroyed = TRUE;
g_object_unref(surface->buffers[i]);
}
g_object_unref(surface->picture);
surface->surface_view_widget->frame_callback = NULL;
surface->surface_view_widget->frame_callback_data = NULL;
g_object_unref(surface->surface_view_widget);
wl_resource_destroy(surface->wl_surface);
wl_event_source_timer_update(surface->frame_timer, 0);
if (surface->frame_callback)
wl_resource_destroy(surface->frame_callback);
surface->frame_callback = NULL;
g_free(surface);
}
@@ -171,14 +203,14 @@ static void surface_destroy(struct wl_client *client, struct wl_resource *resour
static void surface_set_buffer_scale(struct wl_client *client, struct wl_resource *resource, int32_t scale)
{
struct surface *surface = wl_resource_get_user_data(resource);
surface->picture = _PTR((((uint64_t)(uintptr_t)surface->picture) & 0xffffffff00000000L) | ((uintptr_t)(uint32_t)scale));
surface->surface_view_widget = _PTR((((uint64_t)(uintptr_t)surface->surface_view_widget) & 0xffffffff00000000L) | ((uintptr_t)(uint32_t)scale));
}
/* we abuse this method to set higher 32 bits of the GtkPicture pointer */
static void surface_set_buffer_transform(struct wl_client *client, struct wl_resource *resource, int32_t transform)
{
struct surface *surface = wl_resource_get_user_data(resource);
surface->picture = _PTR((((uint64_t)(uintptr_t)surface->picture) & 0x00000000ffffffffL) | ((uintptr_t)(uint32_t)transform)<<32);
surface->surface_view_widget = _PTR((((uint64_t)(uintptr_t)surface->surface_view_widget) & 0x00000000ffffffffL) | ((uintptr_t)(uint32_t)transform)<<32);
}
static struct wl_surface_interface surface_implementation = {
@@ -197,6 +229,7 @@ static void compositor_create_surface(struct wl_client *client, struct wl_resour
struct surface *surface = g_new0(struct surface, 1);
wl_resource_set_implementation(wl_surface, &surface_implementation, surface, NULL);
surface->wl_surface = wl_surface;
surface->frame_timer = wl_event_loop_add_timer(event_loop, frame_timer, surface);
}
static struct wl_compositor_interface compositor_implementation = {
@@ -222,7 +255,7 @@ static gpointer wayland_server_thread(gpointer user_data)
wl_display_flush_clients(wl_display_server);
g_mutex_unlock(&mutex);
}
return 0;
return 0;
}
extern GtkWindow *window;
@@ -234,7 +267,7 @@ struct wl_display *wayland_server_start()
egl_display_gtk = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, wl_display_gtk, NULL);
gl_context_gtk = gdk_surface_create_gl_context(gtk_native_get_surface(GTK_NATIVE(window)), NULL);
struct wl_display *wl_display_server = wl_display_create();
wl_display_server = wl_display_create();
char tmpname[] = "/tmp/tmpdir.XXXXXX\0socket";
int tmplen = strlen(tmpname);
mkdtemp(tmpname);