Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Refactor GL rendering to prepare for GTK4 #50754

Merged
merged 11 commits into from
Feb 29, 2024
Merged

Refactor GL rendering to prepare for GTK4 #50754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f71dec
Add checks for FlRenderer methods
robert-ancell Feb 16, 2024
4ad5bb0
Refactor GL rendering to prepare for GTK4
robert-ancell Feb 13, 2024
74232b6
Stop using constructed, we can use init now code requiring this was m…
robert-ancell Feb 21, 2024
1625590
Add link to platform view support issue
robert-ancell Feb 21, 2024
5d7ca6e
Drop explicitly setting use_es - this doesn't seem to be necessary an…
robert-ancell Feb 21, 2024
829ae5e
Add note about allocated strings
robert-ancell Feb 21, 2024
c48a8e0
Remove fl_gl_area.cc from licenses
robert-ancell Feb 21, 2024
8e20149
Fix formatting
robert-ancell Feb 21, 2024
6165894
Merge branch 'main' into standard-gtk-gl-area
robert-ancell Feb 29, 2024
c2b0052
Merge remote-tracking branch 'origin/main' into standard-gtk-gl-area
robert-ancell Feb 29, 2024
446a30b
Fix formatting
robert-ancell Feb 29, 2024
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
12 changes: 4 additions & 8 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36899,8 +36899,6 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_engine_private.h + ../../../flu
ORIGIN: ../../../flutter/shell/platform/linux/fl_engine_test.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_gl_area.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_gl_area.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -36950,8 +36948,8 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc + ../.
ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gl.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gl.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gdk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gdk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_headless.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_headless.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_manager.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -39772,8 +39770,6 @@ FILE: ../../../flutter/shell/platform/linux/fl_engine_private.h
FILE: ../../../flutter/shell/platform/linux/fl_engine_test.cc
FILE: ../../../flutter/shell/platform/linux/fl_event_channel.cc
FILE: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc
FILE: ../../../flutter/shell/platform/linux/fl_gl_area.cc
FILE: ../../../flutter/shell/platform/linux/fl_gl_area.h
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.h
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc
Expand Down Expand Up @@ -39823,8 +39819,8 @@ FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc
FILE: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc
FILE: ../../../flutter/shell/platform/linux/fl_renderer.cc
FILE: ../../../flutter/shell/platform/linux/fl_renderer.h
FILE: ../../../flutter/shell/platform/linux/fl_renderer_gl.cc
FILE: ../../../flutter/shell/platform/linux/fl_renderer_gl.h
FILE: ../../../flutter/shell/platform/linux/fl_renderer_gdk.cc
FILE: ../../../flutter/shell/platform/linux/fl_renderer_gdk.h
FILE: ../../../flutter/shell/platform/linux/fl_renderer_headless.cc
FILE: ../../../flutter/shell/platform/linux/fl_renderer_headless.h
FILE: ../../../flutter/shell/platform/linux/fl_scrolling_manager.cc
Expand Down
8 changes: 5 additions & 3 deletions shell/platform/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ source_set("flutter_linux_sources") {
"fl_dart_project.cc",
"fl_engine.cc",
"fl_event_channel.cc",
"fl_gl_area.cc",
"fl_gnome_settings.cc",
"fl_json_message_codec.cc",
"fl_json_method_codec.cc",
Expand All @@ -126,7 +125,7 @@ source_set("flutter_linux_sources") {
"fl_plugin_registrar.cc",
"fl_plugin_registry.cc",
"fl_renderer.cc",
"fl_renderer_gl.cc",
"fl_renderer_gdk.cc",
"fl_renderer_headless.cc",
"fl_scrolling_manager.cc",
"fl_scrolling_view_delegate.cc",
Expand Down Expand Up @@ -246,7 +245,10 @@ executable("flutter_linux_unittests") {

public_configs = [ "//flutter:config" ]

configs += [ "//flutter/shell/platform/linux/config:gtk" ]
configs += [
"//flutter/shell/platform/linux/config:gtk",
"//flutter/shell/platform/linux/config:epoxy",
]

defines = [
"FLUTTER_ENGINE_NO_PROTOTYPES",
Expand Down
24 changes: 6 additions & 18 deletions shell/platform/linux/fl_engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,22 +217,14 @@ static void* fl_engine_gl_proc_resolver(void* user_data, const char* name) {

static bool fl_engine_gl_make_current(void* user_data) {
FlEngine* self = static_cast<FlEngine*>(user_data);
g_autoptr(GError) error = nullptr;
gboolean result = fl_renderer_make_current(self->renderer, &error);
if (!result) {
g_warning("%s", error->message);
}
return result;
fl_renderer_make_current(self->renderer);
return true;
}

static bool fl_engine_gl_clear_current(void* user_data) {
FlEngine* self = static_cast<FlEngine*>(user_data);
g_autoptr(GError) error = nullptr;
gboolean result = fl_renderer_clear_current(self->renderer, &error);
if (!result) {
g_warning("%s", error->message);
}
return result;
fl_renderer_clear_current(self->renderer);
return true;
}

static uint32_t fl_engine_gl_get_fbo(void* user_data) {
Expand All @@ -248,12 +240,8 @@ static bool fl_engine_gl_present(void* user_data) {

static bool fl_engine_gl_make_resource_current(void* user_data) {
FlEngine* self = static_cast<FlEngine*>(user_data);
g_autoptr(GError) error = nullptr;
gboolean result = fl_renderer_make_resource_current(self->renderer, &error);
if (!result) {
g_warning("%s", error->message);
}
return result;
fl_renderer_make_resource_current(self->renderer);
return true;
}

// Called by the engine to retrieve an external texture.
Expand Down
136 changes: 0 additions & 136 deletions shell/platform/linux/fl_gl_area.cc
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions shell/platform/linux/fl_gl_area.h
View file
Open in desktop

This file was deleted.

Loading