[Impeller] Reland move more files to core.

ci/licenses_golden/licenses_flutter

@@ -1124,6 +1124,16 @@ ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/range.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/resource_binder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/resource_binder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/runtime_types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/runtime_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/shader_types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/shader_types.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/texture.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/texture.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/texture_descriptor.cc + ../../../flutter/LICENSE
@@ -1548,10 +1558,6 @@ ORIGIN: ../../../flutter/impeller/renderer/render_target.cc + ../../../flutter/L
 ORIGIN: ../../../flutter/impeller/renderer/render_target.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/renderer.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/renderer.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/sampler.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/sampler.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/sampler_descriptor.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/sampler_descriptor.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/sampler_library.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/sampler_library.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/shader_function.cc + ../../../flutter/LICENSE
@@ -1560,8 +1566,6 @@ ORIGIN: ../../../flutter/impeller/renderer/shader_key.cc + ../../../flutter/LICE
 ORIGIN: ../../../flutter/impeller/renderer/shader_key.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/shader_library.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/shader_library.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/shader_types.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/shader_types.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/snapshot.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/snapshot.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/stroke.comp + ../../../flutter/LICENSE
@@ -1576,8 +1580,6 @@ ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs + ../../../flu
 ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_types.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_types.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/scene/animation/animation.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/scene/animation/animation.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/scene/animation/animation_clip.cc + ../../../flutter/LICENSE
@@ -3699,6 +3701,16 @@ FILE: ../../../flutter/impeller/core/platform.cc
 FILE: ../../../flutter/impeller/core/platform.h
 FILE: ../../../flutter/impeller/core/range.cc
 FILE: ../../../flutter/impeller/core/range.h
+FILE: ../../../flutter/impeller/core/resource_binder.cc
+FILE: ../../../flutter/impeller/core/resource_binder.h
+FILE: ../../../flutter/impeller/core/runtime_types.cc
+FILE: ../../../flutter/impeller/core/runtime_types.h
+FILE: ../../../flutter/impeller/core/sampler.cc
+FILE: ../../../flutter/impeller/core/sampler.h
+FILE: ../../../flutter/impeller/core/sampler_descriptor.cc
+FILE: ../../../flutter/impeller/core/sampler_descriptor.h
+FILE: ../../../flutter/impeller/core/shader_types.cc
+FILE: ../../../flutter/impeller/core/shader_types.h
 FILE: ../../../flutter/impeller/core/texture.cc
 FILE: ../../../flutter/impeller/core/texture.h
 FILE: ../../../flutter/impeller/core/texture_descriptor.cc
@@ -4123,10 +4135,6 @@ FILE: ../../../flutter/impeller/renderer/render_target.cc
 FILE: ../../../flutter/impeller/renderer/render_target.h
 FILE: ../../../flutter/impeller/renderer/renderer.cc
 FILE: ../../../flutter/impeller/renderer/renderer.h
-FILE: ../../../flutter/impeller/renderer/sampler.cc
-FILE: ../../../flutter/impeller/renderer/sampler.h
-FILE: ../../../flutter/impeller/renderer/sampler_descriptor.cc
-FILE: ../../../flutter/impeller/renderer/sampler_descriptor.h
 FILE: ../../../flutter/impeller/renderer/sampler_library.cc
 FILE: ../../../flutter/impeller/renderer/sampler_library.h
 FILE: ../../../flutter/impeller/renderer/shader_function.cc
@@ -4135,8 +4143,6 @@ FILE: ../../../flutter/impeller/renderer/shader_key.cc
 FILE: ../../../flutter/impeller/renderer/shader_key.h
 FILE: ../../../flutter/impeller/renderer/shader_library.cc
 FILE: ../../../flutter/impeller/renderer/shader_library.h
-FILE: ../../../flutter/impeller/renderer/shader_types.cc
-FILE: ../../../flutter/impeller/renderer/shader_types.h
 FILE: ../../../flutter/impeller/renderer/snapshot.cc
 FILE: ../../../flutter/impeller/renderer/snapshot.h
 FILE: ../../../flutter/impeller/renderer/stroke.comp
@@ -4151,8 +4157,6 @@ FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.h
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h
-FILE: ../../../flutter/impeller/runtime_stage/runtime_types.cc
-FILE: ../../../flutter/impeller/runtime_stage/runtime_types.h
 FILE: ../../../flutter/impeller/scene/animation/animation.cc
 FILE: ../../../flutter/impeller/scene/animation/animation.h
 FILE: ../../../flutter/impeller/scene/animation/animation_clip.cc

impeller/aiks/canvas.h

@@ -13,13 +13,13 @@
 #include "impeller/aiks/image.h"
 #include "impeller/aiks/paint.h"
 #include "impeller/aiks/picture.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/entity_pass.h"
 #include "impeller/entity/geometry.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_frame.h"
 

impeller/compiler/code_gen_template.h

@@ -18,13 +18,11 @@ constexpr std::string_view kReflectionHeaderTemplate =
 {# file itself and the no-check declarations will be stripped in generated files.#}
 #include "impeller/core/buffer_view.h"                {# // nogncheck #}
 
-#include "impeller/renderer/command.h"                    {# // nogncheck #}
+#include "impeller/core/sampler.h"                    {# // nogncheck #}
 
-#include "impeller/renderer/compute_command.h"            {# // nogncheck #}
+#include "impeller/core/shader_types.h"               {# // nogncheck #}
 
-#include "impeller/renderer/sampler.h"                    {# // nogncheck #}
-
-#include "impeller/renderer/shader_types.h"               {# // nogncheck #}
+#include "impeller/core/resource_binder.h"            {# // nogncheck #}
 
 #include "impeller/core/texture.h"                    {# // nogncheck #}
 

impeller/compiler/reflector.cc

@@ -86,21 +86,6 @@ static std::string ExecutionModelToString(spv::ExecutionModel model) {
   }
 }
 
-static std::string ExecutionModelToCommandTypeName(
-    spv::ExecutionModel execution_model) {
-  switch (execution_model) {
-    case spv::ExecutionModel::ExecutionModelVertex:
-    case spv::ExecutionModel::ExecutionModelFragment:
-    case spv::ExecutionModel::ExecutionModelTessellationControl:
-    case spv::ExecutionModel::ExecutionModelTessellationEvaluation:
-      return "Command&";
-    case spv::ExecutionModel::ExecutionModelGLCompute:
-      return "ComputeCommand&";
-    default:
-      return "unsupported";
-  }
-}
-
 static std::string StringToShaderStage(std::string str) {
   if (str == "vertex") {
     return "ShaderStage::kVertex";
@@ -1100,7 +1085,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{
@@ -1119,7 +1104,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{
@@ -1138,7 +1123,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{

impeller/core/BUILD.gn

@@ -24,6 +24,16 @@ impeller_component("core") {
     "platform.h",
     "range.cc",
     "range.h",
+    "resource_binder.cc",
+    "resource_binder.h",
+    "runtime_types.cc",
+    "runtime_types.h",
+    "sampler.cc",
+    "sampler.h",
+    "sampler_descriptor.cc",
+    "sampler_descriptor.h",
+    "shader_types.cc",
+    "shader_types.h",
     "texture.cc",
     "texture.h",
     "texture_descriptor.cc",

impeller/core/resource_binder.cc

@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/core/resource_binder.h"
+
+namespace impeller {
+
+//
+
+}  // namespace impeller

impeller/core/resource_binder.h

@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <optional>
+#include <string>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/core/texture.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      An interface for binding resources. This is implemented by
+///             |Command| and |ComputeCommand| to make GPU resources available
+///             to a given command's pipeline.
+///
+struct ResourceBinder {
+  virtual ~ResourceBinder() = default;
+
+  virtual bool BindResource(ShaderStage stage,
+                            const ShaderUniformSlot& slot,
+                            const ShaderMetadata& metadata,
+                            const BufferView& view) = 0;
+
+  virtual bool BindResource(ShaderStage stage,
+                            const SampledImageSlot& slot,
+                            const ShaderMetadata& metadata,
+                            const std::shared_ptr<const Texture>& texture) = 0;
+
+  virtual bool BindResource(ShaderStage stage,
+                            const SampledImageSlot& slot,
+                            const ShaderMetadata& metadata,
+                            const std::shared_ptr<const Sampler>& sampler) = 0;
+
+  virtual bool BindResource(ShaderStage stage,
+                            const SampledImageSlot& slot,
+                            const ShaderMetadata& metadata,
+                            const std::shared_ptr<const Texture>& texture,
+                            const std::shared_ptr<const Sampler>& sampler) = 0;
+};
+
+}  // namespace impeller

impeller/runtime_stage/runtime_types.cc → impeller/core/runtime_types.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/runtime_stage/runtime_types.h"
+#include "impeller/core/runtime_types.h"
 
 namespace impeller {
 

impeller/renderer/sampler.cc → impeller/core/sampler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/sampler.h"
+#include "impeller/core/sampler.h"
 
 namespace impeller {
 

impeller/renderer/sampler.h → impeller/core/sampler.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler_descriptor.h"
 
 namespace impeller {
 

impeller/renderer/sampler_descriptor.cc → impeller/core/sampler_descriptor.cc

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler_descriptor.h"
+
 #include "fml/logging.h"
 
 namespace impeller {

impeller/renderer/shader_types.cc → impeller/core/shader_types.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 

impeller/renderer/shader_types.h → impeller/core/shader_types.h

@@ -11,9 +11,9 @@
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/logging.h"
+#include "impeller/core/runtime_types.h"
 #include "impeller/geometry/half.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/runtime_stage/runtime_types.h"
 
 namespace impeller {
 

impeller/display_list/nine_patch_converter.h

@@ -10,8 +10,8 @@
 #include "impeller/aiks/canvas.h"
 #include "impeller/aiks/image.h"
 #include "impeller/aiks/paint.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/geometry/path.h"
-#include "impeller/renderer/sampler_descriptor.h"
 
 namespace impeller {
 

impeller/entity/contents/atlas_contents.h

@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/renderer/sampler_descriptor.h"
 
 namespace impeller {
 

impeller/entity/contents/color_source_contents.cc

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "color_source_contents.h"
+#include "impeller/entity/contents/color_source_contents.h"
 
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/matrix.h"
+#include "impeller/geometry/point.h"
 
 namespace impeller {
 

impeller/entity/contents/contents.h

@@ -9,10 +9,10 @@
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/core/texture.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/renderer/snapshot.h"
 
 namespace impeller {

impeller/entity/contents/filters/gaussian_blur_filter_contents.cc

@@ -11,14 +11,14 @@
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
-#include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 
 namespace impeller {

impeller/entity/contents/gradient_generator.h

@@ -10,11 +10,11 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/impeller/core/texture.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {