Skip to content

Bump Flutter Engine to e059e420.#25

Merged
bdero merged 1 commit intomasterfrom
bdero/bump-flutter-engine-e059e420
Jun 19, 2024
Merged

Bump Flutter Engine to e059e420.#25
bdero merged 1 commit intomasterfrom
bdero/bump-flutter-engine-e059e420

Conversation

@bdero
Copy link
Owner

@bdero bdero commented Jun 18, 2024

Bump Flutter Engine to e059e420 (June 14th).

Changes to impeller-cmake:

  • Update shaders.
  • Add symlink mechanism to allow FML to use includes beginning with flutter/third_party.
  • Remove multi_arch_shader_archive.fbs build.
  • Point to a patch branch off of e059e420 with minor STL compatibility fixes (use explicit includes for array+memory/avoid std namespace for cmath functions).

@bdero bdero force-pushed the bdero/bump-flutter-engine-e059e420 branch 3 times, most recently from 395d15c to 5180d45 Compare June 18, 2024 20:02
@bdero
Copy link
Owner Author

bdero commented Jun 18, 2024

The macOS build is currently failing to link impellerc.

[570/805] Linking CXX executable impellerc
FAILED: impellerc 
: && /Users/runner/work/impeller-cmake/impeller-cmake/llvm/bin/clang++ -g -arch arm64 -isysroot /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names  CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/compiler.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/compiler_backend.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/constants.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/impellerc_main.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/includer.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/reflector.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/runtime_stage_data.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/shader_bundle.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/shader_bundle_data.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/source_options.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/spirv_compiler.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/spirv_sksl.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/switches.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/types.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/uniform_sorter.cc.o CMakeFiles/impellerc.dir/third_party/flutter/impeller/compiler/utilities.cc.o -o impellerc  libfml.a  libimpeller_base.a  libimpeller_geometry.a  libimpeller_runtime_stage.a  third_party/spirv_cross/libspirv-cross-glsl.a  third_party/spirv_cross/libspirv-cross-msl.a  third_party/shaderc/libshaderc/libshaderc.a  libimpeller_base.a  libfml.a  -Xlinker -framework -Xlinker Cocoa  -Xlinker -framework -Xlinker CoreFoundation  third_party/abseil-cpp/absl/debugging/libabsl_symbolize.a  third_party/abseil-cpp/absl/debugging/libabsl_debugging_internal.a  third_party/abseil-cpp/absl/debugging/libabsl_demangle_internal.a  third_party/abseil-cpp/absl/base/libabsl_malloc_internal.a  third_party/abseil-cpp/absl/strings/libabsl_strings.a  third_party/abseil-cpp/absl/strings/libabsl_strings_internal.a  third_party/abseil-cpp/absl/base/libabsl_base.a  third_party/abseil-cpp/absl/base/libabsl_spinlock_wait.a  third_party/abseil-cpp/absl/numeric/libabsl_int128.a  third_party/abseil-cpp/absl/base/libabsl_throw_delegate.a  third_party/abseil-cpp/absl/base/libabsl_raw_logging_internal.a  third_party/abseil-cpp/absl/base/libabsl_log_severity.a  third_party/spirv_cross/libspirv-cross-glsl.a  third_party/spirv_cross/libspirv-cross-core.a  third_party/shaderc/libshaderc_util/libshaderc_util.a  third_party/shaderc/third_party/glslang/glslang/libglslang.a  third_party/shaderc/third_party/glslang/hlsl/libHLSL.a  third_party/shaderc/third_party/glslang/SPIRV/libSPIRV.a  third_party/shaderc/third_party/glslang/glslang/libMachineIndependent.a  third_party/shaderc/third_party/glslang/glslang/OSDependent/Unix/libOSDependent.a  third_party/shaderc/third_party/glslang/OGLCompilersDLL/libOGLCompiler.a  third_party/shaderc/third_party/glslang/glslang/libGenericCodeGen.a  third_party/shaderc/third_party/spirv-tools/source/opt/libSPIRV-Tools-opt.a  third_party/shaderc/third_party/spirv-tools/source/libSPIRV-Tools.a && :
ld: warning: ignoring duplicate libraries: 'libfml.a', 'libimpeller_base.a', 'third_party/spirv_cross/libspirv-cross-glsl.a'
ld: archive member '/' not a mach-o file in '/Users/runner/work/impeller-cmake/impeller-cmake/out/build/ninja-debug/third_party/shaderc/third_party/glslang/hlsl/libHLSL.a'
clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
Error: Process completed with exit code 1.

This also happens to be locally when using homebrew clang++, but doesn't happen when using xcode's clang distribution. Need to tease the macOS build into using the correct toolchain.

@bdero bdero force-pushed the bdero/bump-flutter-engine-e059e420 branch 3 times, most recently from 3b4cc43 to 2171619 Compare June 18, 2024 23:27
@bdero bdero force-pushed the bdero/bump-flutter-engine-e059e420 branch from 2171619 to 906e3cb Compare June 18, 2024 23:56
@bdero bdero merged commit 4d3dce3 into master Jun 19, 2024
auto-submit bot pushed a commit to flutter/engine that referenced this pull request Jun 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Comments