Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions shell/platform/linux/fl_engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,9 @@ FlEngine* fl_engine_new(FlDartProject* project, FlRenderer* renderer) {
self->project = FL_DART_PROJECT(g_object_ref(project));
self->renderer = FL_RENDERER(g_object_ref(renderer));
self->binary_messenger = fl_binary_messenger_new(self);

fl_renderer_set_engine(self->renderer, self);

return self;
}

Expand Down
27 changes: 21 additions & 6 deletions shell/platform/linux/fl_renderer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ static const char* fragment_shader_src =
G_DEFINE_QUARK(fl_renderer_error_quark, fl_renderer_error)

typedef struct {
// Engine we are rendering.
GWeakRef engine;

FlView* view;

// target dimension for resizing
Expand Down Expand Up @@ -103,9 +106,10 @@ static void fl_renderer_unblock_main_thread(FlRenderer* self) {
if (priv->blocking_main_thread) {
priv->blocking_main_thread = false;

FlTaskRunner* runner =
fl_engine_get_task_runner(fl_view_get_engine(priv->view));
fl_task_runner_release_main_thread(runner);
g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&priv->engine));
if (engine != nullptr) {
fl_task_runner_release_main_thread(fl_engine_get_task_runner(engine));
}
}
}

Expand Down Expand Up @@ -239,6 +243,7 @@ static void fl_renderer_dispose(GObject* object) {

fl_renderer_unblock_main_thread(self);

g_weak_ref_clear(&priv->engine);
g_clear_pointer(&priv->framebuffers, g_ptr_array_unref);

G_OBJECT_CLASS(fl_renderer_parent_class)->dispose(object);
Expand All @@ -254,6 +259,15 @@ static void fl_renderer_init(FlRenderer* self) {
priv->framebuffers = g_ptr_array_new_with_free_func(g_object_unref);
}

void fl_renderer_set_engine(FlRenderer* self, FlEngine* engine) {
FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
fl_renderer_get_instance_private(self));

g_return_if_fail(FL_IS_RENDERER(self));

g_weak_ref_init(&priv->engine, engine);
}

gboolean fl_renderer_start(FlRenderer* self, FlView* view) {
FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
fl_renderer_get_instance_private(self));
Expand Down Expand Up @@ -348,9 +362,10 @@ void fl_renderer_wait_for_frame(FlRenderer* self,

if (priv->had_first_frame && !priv->blocking_main_thread) {
priv->blocking_main_thread = true;
FlTaskRunner* runner =
fl_engine_get_task_runner(fl_view_get_engine(priv->view));
fl_task_runner_block_main_thread(runner);
g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&priv->engine));
if (engine != nullptr) {
fl_task_runner_block_main_thread(fl_engine_get_task_runner(engine));
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions shell/platform/linux/fl_renderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ struct _FlRendererClass {
gdouble (*get_refresh_rate)(FlRenderer* renderer);
};

/**
* fl_renderer_set_engine:
* @renderer: an #FlRenderer.
* @engine: an #FlEngine.
*
* Called when the renderer is connected to an engine.
*/
void fl_renderer_set_engine(FlRenderer* renderer, FlEngine* engine);

/**
* fl_renderer_start:
* @renderer: an #FlRenderer.
Expand Down