[Tizen] Revert "Make the context current before accessing GL in MakeS…

…kiaGpuImage" (flutter-tizen#363) This reverts commit c7894a6.
JSUYA · Mar 18, 2024 · 21c4cae · 21c4cae
1 parent 92afd58
commit 21c4cae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -350,13 +350,5 @@ if (enable_unittests) {
       sources += [ "shell_io_manager_unittests.cc" ]
       deps += [ "//flutter/third_party/swiftshader" ]
     }
-
-    if (shell_enable_gl) {
-      deps += [
-        "//flutter/third_party/swiftshader",
-        "//third_party/angle:libEGL_static",
-        "//third_party/angle:libGLESv2_static",
-      ]
-    }
   }
 }
diff --git a/shell/common/fixtures/shell_test.dart b/shell/common/fixtures/shell_test.dart
@@ -336,9 +336,6 @@ void scene_with_red_box() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
-@pragma('vm:external-name', 'NativeOnBeforeToImageSync')
-external void onBeforeToImageSync();
-
 
 @pragma('vm:entry-point')
 Future<void> toImageSync() async {
@@ -347,7 +344,6 @@ Future<void> 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
@@ -346,27 +346,24 @@ std::unique_ptr<Rasterizer::GpuImageResult> 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<SnapshotDelegate::GpuImageResult> 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,
                        surface = surface_.get(),
                        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
@@ -15,10 +15,6 @@
 #include <utility>
 #include <vector>
 
-#if SHELL_ENABLE_GL
-#include <EGL/egl.h>
-#endif  // SHELL_ENABLE_GL
-
 #include "assets/directory_asset_bundle.h"
 #include "common/graphics/persistent_cache.h"
 #include "flutter/flow/layers/backdrop_filter_layer.h"
@@ -4039,11 +4035,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.