Revert "[Impeller] Start of Dart GPU prototype"

BUILD.gn

@@ -177,10 +177,7 @@ group("unittests") {
     }
 
     if (is_mac || is_linux || is_win) {
-      public_deps += [
-        "//flutter/impeller:impeller_dart_unittests",
-        "//flutter/impeller:impeller_unittests",
-      ]
+      public_deps += [ "//flutter/impeller:impeller_unittests" ]
     }
 
     if (is_mac) {

ci/licenses_golden/licenses_flutter

@@ -1701,14 +1701,11 @@ ORIGIN: ../../../flutter/lib/ui/dart_runtime_hooks.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/dart_ui.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/dart_ui.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/dart_wrapper.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/experiments/gpu.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/experiments/scene.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/experiments/setup_hooks.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/experiments/ui.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/floating_point.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/geometry.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/gpu/context.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/gpu/context.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/hash_codes.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/hooks.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/io_manager.cc + ../../../flutter/LICENSE
@@ -4349,14 +4346,11 @@ FILE: ../../../flutter/lib/ui/dart_runtime_hooks.h
 FILE: ../../../flutter/lib/ui/dart_ui.cc
 FILE: ../../../flutter/lib/ui/dart_ui.h
 FILE: ../../../flutter/lib/ui/dart_wrapper.h
-FILE: ../../../flutter/lib/ui/experiments/gpu.dart
 FILE: ../../../flutter/lib/ui/experiments/scene.dart
 FILE: ../../../flutter/lib/ui/experiments/setup_hooks.dart
 FILE: ../../../flutter/lib/ui/experiments/ui.dart
 FILE: ../../../flutter/lib/ui/floating_point.h
 FILE: ../../../flutter/lib/ui/geometry.dart
-FILE: ../../../flutter/lib/ui/gpu/context.cc
-FILE: ../../../flutter/lib/ui/gpu/context.h
 FILE: ../../../flutter/lib/ui/hash_codes.dart
 FILE: ../../../flutter/lib/ui/hooks.dart
 FILE: ../../../flutter/lib/ui/io_manager.cc

impeller/fixtures/dart_tests.dart

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui' as ui;
-//import 'dart:gpu';
+import 'dart:ui';
 
 void main() {}
 

impeller/renderer/BUILD.gn

@@ -160,6 +160,6 @@ impeller_component("renderer_dart_unittests") {
     "../playground:playground_test",
     "//flutter/runtime:runtime",
     "//flutter/testing:fixture_test",
-    "//flutter/testing:testing",
+    "//flutter/testing:testing_lib",
   ]
 }

impeller/renderer/renderer_dart_unittests.cc

@@ -2,14 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#define FML_USED_ON_EMBEDDER
-
 #include <memory>
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
-#include "flutter/fml/backtrace.h"
-#include "flutter/fml/command_line.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/runtime/dart_isolate.h"
 #include "flutter/runtime/dart_vm_lifecycle.h"
@@ -25,7 +21,6 @@
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/sampler_library.h"
 
-#include "gtest/gtest.h"
 #include "third_party/imgui/imgui.h"
 
 namespace impeller {
@@ -38,9 +33,7 @@ class RendererDartTest : public PlaygroundTest,
       : settings_(CreateSettingsForFixture()),
         vm_ref_(flutter::DartVMRef::Create(settings_)) {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
-
     current_task_runner_ = fml::MessageLoop::GetCurrent().GetTaskRunner();
-
     isolate_ = CreateDartIsolate();
     assert(isolate_);
     assert(isolate_->get()->GetPhase() == flutter::DartIsolate::Phase::Running);

lib/ui/BUILD.gn

@@ -216,12 +216,6 @@ source_set("ui") {
       "painting/scene/scene_shader.h",
     ]
 
-    # Experimental "Impeller Dart" API.
-    sources += [
-      "gpu/context.cc",
-      "gpu/context.h",
-    ]
-
     deps += [ "//flutter/impeller/scene" ]
   }
 }

lib/ui/dart_ui.cc

@@ -12,7 +12,6 @@
 #include "flutter/lib/ui/compositing/scene.h"
 #include "flutter/lib/ui/compositing/scene_builder.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
-#include "flutter/lib/ui/gpu/context.h"
 #include "flutter/lib/ui/isolate_name_server/isolate_name_server_natives.h"
 #include "flutter/lib/ui/painting/canvas.h"
 #include "flutter/lib/ui/painting/codec.h"
@@ -316,10 +315,6 @@ typedef CanvasPath Path;
   V(SceneShader, SetCameraTransform, 2) \
   V(SceneShader, Dispose, 1)
 
-#define FFI_FUNCTION_LIST_GPU(V) V(GpuContext::InitializeDefault, 1)
-
-#define FFI_METHOD_LIST_GPU(V)
-
 #endif  // IMPELLER_ENABLE_3D
 
 #define FFI_FUNCTION_INSERT(FUNCTION, ARGS)     \
@@ -348,13 +343,9 @@ void* ResolveFfiNativeFunction(const char* name, uintptr_t args) {
 void InitDispatcherMap() {
   FFI_FUNCTION_LIST(FFI_FUNCTION_INSERT)
   FFI_METHOD_LIST(FFI_METHOD_INSERT)
-
 #ifdef IMPELLER_ENABLE_3D
   FFI_FUNCTION_LIST_3D(FFI_FUNCTION_INSERT)
   FFI_METHOD_LIST_3D(FFI_METHOD_INSERT)
-
-  FFI_FUNCTION_LIST_GPU(FFI_FUNCTION_INSERT)
-  FFI_METHOD_LIST_GPU(FFI_METHOD_INSERT)
 #endif  // IMPELLER_ENABLE_3D
 }
 

lib/ui/experiments/ui.dart

@@ -37,10 +37,8 @@ part '../painting.dart';
 part '../platform_dispatcher.dart';
 part '../plugins.dart';
 part '../pointer.dart';
+part 'scene.dart';
 part '../semantics.dart';
 part 'setup_hooks.dart';
 part '../text.dart';
 part '../window.dart';
-
-part 'gpu.dart';
-part 'scene.dart';