Merge remote-tracking branch 'upstream/master' into ios-text-input-arc2

Author: LongCatIsLooong

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '1b194c67700e9e3083e6d45bde1f558228ecff14',
+  'skia_revision': '7bd37737e35df1cfe1a95a6d908e79348deb1504',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,22 +48,22 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '0940b5e6ccd5d6a50b6425cf4f1449df56fd4095',
+  'dart_revision': '21f2997a8fc68a791f9bae48ef3f429fd483cc54',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
-  'dart_binaryen_rev': 'ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
+  'dart_binaryen_rev': '7769139efbe818c7ba36d1a382db5114ebee9df8',
   'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
   'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
   'dart_browser_launcher_rev': '5fa0bd6cddc33785f43c920576fc03dcee1c3caa',
   'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
   'dart_collection_rev': 'caf6802bbea65a1a2f9c455add31449dc15b92ba',
   'dart_devtools_rev': 'dd3fade2bd2ef74fc6102e56333a48f0efc594d3',
-  'dart_protobuf_rev': '4f3e32808a954060e48fea1178e943bfa989fcd5',
+  'dart_protobuf_rev': '2706b53d2175b5e1081603059ef1b7b30956f6b8',
   'dart_pub_rev': '21aa23f148a428ae4dd97a27ecc70b08c1328089',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': 'e39506eec48f1d83f8b7fa6de4405e7bb9137418',
+  'dart_webdev_rev': '3e2364ee3539ae08f350d03a3a5f3c22aa74d994',
   'dart_webkit_inspection_protocol_rev': 'ddb624cd85954dd384056cc253a8fc2b9da5364d',
   'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -298,7 +298,7 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/binaryen/src':
-   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
+   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@7769139efbe818c7ba36d1a382db5114ebee9df8',
 
   'src/third_party/dart/third_party/devtools':
    {'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
@@ -340,7 +340,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@bc86574772350fa7d4cd4fa334b6652f08f750ba',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@4d7dc93bdcca4f8c5c3760122930f17aac8a7db6',
+   Var('dart_git') + '/dartdoc.git@f2bb6e92aa4fa76a409f301773d5be6bfda897dc',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@17a8142da8114a065e03200467c7657b5368a86d',
@@ -349,7 +349,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@62916f2de9074a2832de6211df8d72c912902e97',
+   Var('dart_git') + '/fixnum.git@e4f5e9773de053adcb03bff9f02fa6f9c596fe4c',
 
   'src/third_party/dart/third_party/pkg/glob':
    Var('dart_git') + '/glob.git@7f97bf5be6bfe8c90a92283e4c590dba2a676083',
@@ -376,13 +376,13 @@ deps = {
    Var('dart_git') + '/linter.git@7fe671cdadb52139295bae0abf62c014369af93a',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
+   Var('dart_git') + '/logging.git@0373ef85aa1dfe9e179b9fa006c45b65903787f2',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@ee3f4e976efcfed87c6ec78364bc2dd3c6e717b9',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@15d4af21002ae9adee952110192a3face96307c7',
+   Var('dart_git') + '/matcher.git@7e6a665da079baa3e2a2046ab02e4353ee32556c',
 
   'src/third_party/dart/third_party/pkg/mime':
    Var('dart_git') + '/mime.git@c0c4c47a3d7bf696f1aa1959fb83d598baadb33c',
@@ -409,7 +409,7 @@ deps = {
    Var('dart_git') + '/pub_semver.git@17231113f98c80285881cc4452863bcfd085d1a8',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@1c2104737973715426035c11ba840c7f23d8f186',
+   Var('dart_git') + '/shelf.git@32e342d2498db739d2d79123cecd8f2e8d598c3b',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
@@ -436,7 +436,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@822cd5b3418615c6db715a796c2c9ba9acb63b0d',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@4dceb87cd7bb5995e43639a3e93c8fcbe303e228',
+   Var('dart_git') + '/test.git@73cd75404cea342cce06361d4e2fc1069f69122b',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@52b6753852661787208e003f9716b079026c7ac7',
@@ -826,7 +826,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'rRJIjuO-dPNCpCTd9fnOc5ISL21HS5JbpRnk-HNpdsQC'
+        'version': '8O5rMR_ehMaL3YhZ56B1Q-pS15TRm3MJOichyVr5L7MC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_flutter

@@ -1662,19 +1662,19 @@ FILE: ../../../flutter/impeller/scene/importer/vertices_builder.cc
 FILE: ../../../flutter/impeller/scene/importer/vertices_builder.h
 FILE: ../../../flutter/impeller/scene/material.cc
 FILE: ../../../flutter/impeller/scene/material.h
+FILE: ../../../flutter/impeller/scene/mesh.cc
+FILE: ../../../flutter/impeller/scene/mesh.h
+FILE: ../../../flutter/impeller/scene/node.cc
+FILE: ../../../flutter/impeller/scene/node.h
 FILE: ../../../flutter/impeller/scene/scene.cc
 FILE: ../../../flutter/impeller/scene/scene.h
 FILE: ../../../flutter/impeller/scene/scene_context.cc
 FILE: ../../../flutter/impeller/scene/scene_context.h
 FILE: ../../../flutter/impeller/scene/scene_encoder.cc
 FILE: ../../../flutter/impeller/scene/scene_encoder.h
-FILE: ../../../flutter/impeller/scene/scene_entity.cc
-FILE: ../../../flutter/impeller/scene/scene_entity.h
 FILE: ../../../flutter/impeller/scene/scene_unittests.cc
 FILE: ../../../flutter/impeller/scene/shaders/geometry.vert
 FILE: ../../../flutter/impeller/scene/shaders/unlit.frag
-FILE: ../../../flutter/impeller/scene/static_mesh_entity.cc
-FILE: ../../../flutter/impeller/scene/static_mesh_entity.h
 FILE: ../../../flutter/impeller/tessellator/c/tessellator.cc
 FILE: ../../../flutter/impeller/tessellator/c/tessellator.h
 FILE: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 6d236eac71842efcfd0e0ebd5345abaa
+Signature: 51bd5d6a89ef1e691f6d7e38c5867036
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 4f2a325d6153a64a89594520fa0afd23
+Signature: bdf58cf8eb6e1b77bc9810baa4bc2c37
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 849b54362fec2170c5801c1c838b3af4
+Signature: bbed4848080f583e902b9c35c163678b
 
 UNUSED LICENSES:
 
@@ -14311,6 +14311,7 @@ FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_util_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/list.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/math_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/named_parameters.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/print_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_helper.dart

ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: f6d8146c82d268e2e2549bf5019ebf07
+Signature: 9d0f7a4c4f53b80e33da848062bef937
 

impeller/compiler/compiler.cc

@@ -42,7 +42,6 @@ static CompilerBackend CreateMSLCompiler(const spirv_cross::ParsedIR& ir,
   // shaders in the flutter/engine tree.
   if (source_options.remap_samplers) {
     std::vector<uint32_t> sampler_offsets;
-    std::vector<uint32_t> float_offsets;
     ir.for_each_typed_id<spirv_cross::SPIRVariable>(
         [&](uint32_t, const spirv_cross::SPIRVariable& var) {
           if (var.storage != spv::StorageClassUniformConstant) {
@@ -54,9 +53,6 @@ static CompilerBackend CreateMSLCompiler(const spirv_cross::ParsedIR& ir,
           if (spir_type.basetype ==
               spirv_cross::SPIRType::BaseType::SampledImage) {
             sampler_offsets.push_back(location);
-          } else if (spir_type.basetype ==
-                     spirv_cross::SPIRType::BaseType::Float) {
-            float_offsets.push_back(location);
           }
         });
     if (sampler_offsets.size() > 0) {
@@ -68,20 +64,11 @@ static CompilerBackend CreateMSLCompiler(const spirv_cross::ParsedIR& ir,
             .basetype = spirv_cross::SPIRType::BaseType::SampledImage,
             .binding = offset,
             .count = 1u,
+            // A sampled image is both an image and a sampler, so both
+            // offsets need to be set or depending on the partiular shader
+            // the bindings may be incorrect.
             .msl_texture = offset - start_offset,
-        });
-      }
-    }
-    if (float_offsets.size() > 0) {
-      auto start_offset =
-          *std::min_element(float_offsets.begin(), float_offsets.end());
-      for (auto offset : float_offsets) {
-        sl_compiler->add_msl_resource_binding({
-            .stage = spv::ExecutionModel::ExecutionModelFragment,
-            .basetype = spirv_cross::SPIRType::BaseType::Float,
-            .binding = offset,
-            .count = 1u,
-            .msl_buffer = offset - start_offset,
+            .msl_sampler = offset - start_offset,
         });
       }
     }

impeller/compiler/switches_unittests.cc

@@ -69,6 +69,17 @@ TEST(SwitchesTest, EntryPointCanBeSetForHLSL) {
   ASSERT_EQ(switches.entry_point, "CustomEntryPoint");
 }
 
+TEST(SwitchesTEst, ConvertToEntrypointName) {
+  ASSERT_EQ(ConvertToEntrypointName("mandelbrot_unrolled"),
+            "mandelbrot_unrolled");
+  ASSERT_EQ(ConvertToEntrypointName("mandelbrot-unrolled"),
+            "mandelbrotunrolled");
+  ASSERT_EQ(ConvertToEntrypointName("7_"), "i_7_");
+  ASSERT_EQ(ConvertToEntrypointName("415"), "i_415");
+  ASSERT_EQ(ConvertToEntrypointName("#$%"), "i_");
+  ASSERT_EQ(ConvertToEntrypointName(""), "");
+}
+
 }  // namespace testing
 }  // namespace compiler
 }  // namespace impeller

impeller/compiler/types.cc

@@ -96,7 +96,7 @@ std::string EntryPointFunctionNameFromSourceName(
 
   std::stringstream stream;
   std::filesystem::path file_path(file_name);
-  stream << Utf8FromPath(file_path.stem()) << "_";
+  stream << ConvertToEntrypointName(Utf8FromPath(file_path.stem())) << "_";
   switch (type) {
     case SourceType::kUnknown:
       stream << "unknown";

impeller/compiler/utilities.cc

@@ -43,5 +43,23 @@ std::string ConvertToCamelCase(std::string_view string) {
   return stream.str();
 }
 
+std::string ConvertToEntrypointName(std::string_view string) {
+  if (string.empty()) {
+    return "";
+  }
+  std::stringstream stream;
+  // Append a prefix if the first character is not a letter.
+  if (!std::isalpha(string.data()[0])) {
+    stream << "i_";
+  }
+  for (size_t i = 0, count = string.length(); i < count; i++) {
+    auto ch = string.data()[i];
+    if (std::isalnum(ch) || ch == '_') {
+      stream << ch;
+    }
+  }
+  return stream.str();
+}
+
 }  // namespace compiler
 }  // namespace impeller

impeller/compiler/utilities.h

@@ -25,5 +25,9 @@ std::string InferShaderNameFromPath(std::string_view path);
 
 std::string ConvertToCamelCase(std::string_view string);
 
+/// @brief  Ensure that the entrypoint name is a valid identifier in the target
+///         language.
+std::string ConvertToEntrypointName(std::string_view string);
+
 }  // namespace compiler
 }  // namespace impeller

impeller/fixtures/ordering/shader_with_matrix.frag

@@ -12,16 +12,16 @@ impeller_component("scene") {
     "geometry.h",
     "material.cc",
     "material.h",
+    "mesh.cc",
+    "mesh.h",
+    "node.cc",
+    "node.h",
     "scene.cc",
     "scene.h",
     "scene_context.cc",
     "scene_context.h",
     "scene_encoder.cc",
     "scene_encoder.h",
-    "scene_entity.cc",
-    "scene_entity.h",
-    "static_mesh_entity.cc",
-    "static_mesh_entity.h",
   ]
 
   public_deps = [

impeller/fixtures/ordering/shader_with_ordered_floats.frag

@@ -43,54 +43,52 @@ run_action.SetLoop(impeller::scene::AnimationAction::kLoopForever);
 run_action.SetWeight(0.3f);
 run_action.Play();
 
-scene.Add(
+scene.GetRoot().AddChild(
     impeller::scene::DirectionalLight(
         /* color */ impeller::Color::AntiqueWhite(),
         /* intensity */ 5,
         /* direction */ {2, 3, 4}));
 
-impeller::scene::StaticMeshEntity sphere_entity;
-sphere_entity.SetGlobalTransform(
+Node sphere_node;
+Mesh sphere_mesh;
+sphere_node.SetGlobalTransform(
     Matrix::MakeRotationEuler({kPiOver4, kPiOver4, 0}));
-sphere_entity.SetCullingMode(impeller::scene::CullingMode::kFrustum);
 
-std::unique_ptr<impeller::scene::SphereGeometry> sphere =
+auto sphere_geometry =
     impeller::scene::Geometry::MakeSphere(allocator, /* radius */ 2);
 
-sphere_entity.SetGeometry(sphere);
-
 auto material = impeller::scene::Material::MakeStandard();
-material.SetAlbedo(impeller::Color::Red());
-material.SetRoughness(0.4);
-material.SetMetallic(0.2);
+material->SetAlbedo(impeller::Color::Red());
+material->SetRoughness(0.4);
+material->SetMetallic(0.2);
 // Common properties shared by all materials.
-material.SetEnvironmentMap(environment_hdri);
-material.SetFlatShaded(true);
-material.SetBlendConfig({
+material->SetEnvironmentMap(environment_hdri);
+material->SetFlatShaded(true);
+material->SetBlendConfig({
   impeller::BlendOperation::kAdd,               // color_op
   impeller::BlendFactor::kOne,                  // source_color_factor
   impeller::BlendFactor::kOneMinusSourceAlpha,  // destination_color_factor
   impeller::BlendOperation::kAdd,               // alpha_op
   impeller::BlendFactor::kOne,                  // source_alpha_factor
   impeller::BlendFactor::kOneMinusSourceAlpha,  // destination_alpha_factor
 });
-material.SetStencilConfig({
+material->SetStencilConfig({
   impeller::StencilOperation::kIncrementClamp,  // operation
   impeller::CompareFunction::kAlways,           // compare
 });
-
-sphere_entity->SetMaterials({material});
-
-
-impeller::scene::StaticMeshEntity cube_entity;
-cube_entity.GetGeometry(
-    impeller::scene::Geometry::MakeCube(allocator, {4, 4, 4}));
-cube_entity.SetMaterials({material});
-
-cube_entity.SetLocalTransform(Matrix::MakeTranslation({4, 0, 0}));
-
-sphere_entity->Add(sube_entity);
-scene.Add(sphere_entity);
+sphere_mesh.AddPrimitive({sphere_geometry, material});
+sphere_node.SetMesh(sphere_mesh);
+
+Node cube_node;
+cube_node.SetLocalTransform(Matrix::MakeTranslation({4, 0, 0}));
+Mesh cube_mesh;
+auto cube_geometry = impeller::scene::Geometry::MakeCuboid(
+    allocator, {4, 4, 4});
+cube_mesh.AddPrimitive({cube_geometry, material});
+cube_node.SetMesh(cube_mesh);
+
+sphere_node.AddChild(cube_node);
+scene.GetRoot().AddChild(sphere_node);
 
 /// Post processing.