diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index c5a4db91e4333..874b503f9a7c9 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -333,13 +333,5 @@ if (enable_unittests) { sources += [ "shell_io_manager_unittests.cc" ] deps += [ "//third_party/swiftshader" ] } - - if (shell_enable_gl) { - deps += [ - "//third_party/angle:libEGL_static", - "//third_party/angle:libGLESv2_static", - "//third_party/swiftshader", - ] - } } } diff --git a/shell/common/fixtures/shell_test.dart b/shell/common/fixtures/shell_test.dart index e4b0d98833f44..5c0dabc1fc2a9 100644 --- a/shell/common/fixtures/shell_test.dart +++ b/shell/common/fixtures/shell_test.dart @@ -354,9 +354,6 @@ void scene_with_red_box() { PlatformDispatcher.instance.scheduleFrame(); } -@pragma('vm:external-name', 'NativeOnBeforeToImageSync') -external void onBeforeToImageSync(); - @pragma('vm:entry-point') Future toImageSync() async { @@ -365,7 +362,6 @@ Future toImageSync() async { canvas.drawPaint(Paint()..color = const Color(0xFFAAAAAA)); final Picture picture = recorder.endRecording(); - onBeforeToImageSync(); final Image image = picture.toImageSync(20, 25); void expect(Object? a, Object? b) { if (a != b) { diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index 9a7e6e16552b0..19d2d4f367a1e 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -314,12 +314,17 @@ std::unique_ptr Rasterizer::MakeSkiaGpuImage( TRACE_EVENT0("flutter", "Rasterizer::MakeGpuImage"); FML_DCHECK(display_list); +// TODO(dnfield): the Linux embedding is in a rough state right now and +// I can't seem to get the GPU path working on it. +// https://github.com/flutter/flutter/issues/108835 +#if FML_OS_LINUX + return MakeBitmapImage(display_list, image_info); +#endif + std::unique_ptr result; delegate_.GetIsGpuDisabledSyncSwitch()->Execute( fml::SyncSwitch::Handlers() .SetIfTrue([&result, &image_info, &display_list] { - // TODO(dnfield): This isn't safe if display_list contains any GPU - // resources like an SkImage_gpu. result = MakeBitmapImage(display_list, image_info); }) .SetIfFalse([&result, &image_info, &display_list, @@ -327,14 +332,6 @@ std::unique_ptr Rasterizer::MakeSkiaGpuImage( gpu_image_behavior = gpu_image_behavior_] { if (!surface || gpu_image_behavior == MakeGpuImageBehavior::kBitmap) { - // TODO(dnfield): This isn't safe if display_list contains any GPU - // resources like an SkImage_gpu. - result = MakeBitmapImage(display_list, image_info); - return; - } - - auto context_switch = surface->MakeRenderContextCurrent(); - if (!context_switch->GetResult()) { result = MakeBitmapImage(display_list, image_info); return; } diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc index 11d911d2bc356..36c61ad663b18 100644 --- a/shell/common/shell_unittests.cc +++ b/shell/common/shell_unittests.cc @@ -14,10 +14,6 @@ #include #include -#if SHELL_ENABLE_GL -#include -#endif // SHELL_ENABLE_GL - #include "assets/directory_asset_bundle.h" #include "common/graphics/persistent_cache.h" #include "flutter/flow/layers/backdrop_filter_layer.h" @@ -4118,11 +4114,6 @@ TEST_F(ShellTest, PictureToImageSync) { }), }); - AddNativeCallback("NativeOnBeforeToImageSync", - CREATE_NATIVE_ENTRY([&](auto args) { - // nop - })); - fml::CountDownLatch latch(2); AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) { // Teardown and set up rasterizer again.