Skip to content

Commit

Permalink
Roll impeller, add impellerc and tessellator_shared to host builds (f…
Browse files Browse the repository at this point in the history 
…lutter#32819)


* Roll to c833f7de604f5c4298216494fb7b7ff378353601
  • Loading branch information
@dnfield
dnfield authored Apr 21, 2022
1 parent af41475 commit 1c2dfbc
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 13 deletions.
16 changes: 6 additions & 10 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ config("export_dynamic_symbols") {
}
}

# Flutter SDK artifacts should only be built when either doing host builds, or
# for cross-compiled desktop targets.
# TODO: We can't build the engine artifacts for arm (32-bit) right now;
# see https://github.com/flutter/flutter/issues/74322
_build_engine_artifacts =
current_toolchain == host_toolchain ||
(is_linux && !is_chromeos && current_cpu != "arm") || is_mac

if (flutter_prebuilt_dart_sdk) {
copy_trees("_copy_trees") {
sources = [
Expand Down Expand Up @@ -85,7 +77,7 @@ group("flutter") {
if (!is_fuchsia) {
public_deps += [ "//flutter/lib/snapshot:generate_snapshot_bins" ]

if (_build_engine_artifacts) {
if (build_engine_artifacts) {
public_deps += [
":dart_sdk",
"//flutter/flutter_frontend_server:frontend_server",
Expand All @@ -94,6 +86,10 @@ group("flutter") {
# //flutter/lib/snapshot:generate_snapshot_bin will only build
# gen_snapshot for the host and not the target.
"//third_party/dart/runtime/bin:gen_snapshot",

# Impeller artifacts - compiler and libtessellator
"//flutter/impeller/compiler:impellerc",
"//flutter/impeller/tessellator:tessellator_shared",
]

if (full_dart_sdk) {
Expand All @@ -102,7 +98,7 @@ group("flutter") {
}
}

if (_build_engine_artifacts) {
if (build_engine_artifacts) {
public_deps += [
"//flutter/shell/testing",
"//flutter/tools/const_finder",
Expand Down
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '2c41cfc742586b44984595960fc161c30252d8d6',

'src/flutter/impeller':
Var('github_git') + '/flutter/impeller' + '@' + 'deab73b33a15261852c380eaa3c843bb5918e5f8',
Var('github_git') + '/flutter/impeller' + '@' + 'c833f7de604f5c4298216494fb7b7ff378353601',

# Fuchsia compatibility
#
Expand Down
54 changes: 53 additions & 1 deletion ci/licenses_golden/licenses_flutter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,17 +438,35 @@ FILE: ../../../flutter/impeller/base/thread_safety.cc
FILE: ../../../flutter/impeller/base/thread_safety.h
FILE: ../../../flutter/impeller/base/validation.cc
FILE: ../../../flutter/impeller/base/validation.h
FILE: ../../../flutter/impeller/blobcat/blob.cc
FILE: ../../../flutter/impeller/blobcat/blob.h
FILE: ../../../flutter/impeller/blobcat/blob_library.cc
FILE: ../../../flutter/impeller/blobcat/blob_library.h
FILE: ../../../flutter/impeller/blobcat/blob_writer.cc
FILE: ../../../flutter/impeller/blobcat/blob_writer.h
FILE: ../../../flutter/impeller/blobcat/blobcat_main.cc
FILE: ../../../flutter/impeller/blobcat/blobcat_unittests.cc
FILE: ../../../flutter/impeller/compiler/code_gen_template.h
FILE: ../../../flutter/impeller/compiler/compiler.cc
FILE: ../../../flutter/impeller/compiler/compiler.h
FILE: ../../../flutter/impeller/compiler/compiler_backend.cc
FILE: ../../../flutter/impeller/compiler/compiler_backend.h
FILE: ../../../flutter/impeller/compiler/compiler_test.cc
FILE: ../../../flutter/impeller/compiler/compiler_test.h
FILE: ../../../flutter/impeller/compiler/compiler_unittests.cc
FILE: ../../../flutter/impeller/compiler/impellerc_main.cc
FILE: ../../../flutter/impeller/compiler/include_dir.h
FILE: ../../../flutter/impeller/compiler/includer.cc
FILE: ../../../flutter/impeller/compiler/includer.h
FILE: ../../../flutter/impeller/compiler/logger.h
FILE: ../../../flutter/impeller/compiler/reflector.cc
FILE: ../../../flutter/impeller/compiler/reflector.h
FILE: ../../../flutter/impeller/compiler/source_options.cc
FILE: ../../../flutter/impeller/compiler/source_options.h
FILE: ../../../flutter/impeller/compiler/switches.cc
FILE: ../../../flutter/impeller/compiler/switches.h
FILE: ../../../flutter/impeller/compiler/types.cc
FILE: ../../../flutter/impeller/compiler/types.h
FILE: ../../../flutter/impeller/compiler/utilities.cc
FILE: ../../../flutter/impeller/compiler/utilities.h
FILE: ../../../flutter/impeller/display_list/display_list_dispatcher.cc
Expand All @@ -469,6 +487,8 @@ FILE: ../../../flutter/impeller/entity/contents/contents.cc
FILE: ../../../flutter/impeller/entity/contents/contents.h
FILE: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.cc
FILE: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.h
FILE: ../../../flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
FILE: ../../../flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.h
FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.cc
FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.h
FILE: ../../../flutter/impeller/entity/contents/filters/filter_input.cc
Expand Down Expand Up @@ -496,6 +516,8 @@ FILE: ../../../flutter/impeller/entity/entity_pass_delegate.h
FILE: ../../../flutter/impeller/entity/entity_playground.cc
FILE: ../../../flutter/impeller/entity/entity_playground.h
FILE: ../../../flutter/impeller/entity/entity_unittests.cc
FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag
FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.vert
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.frag
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.vert
FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag
Expand Down Expand Up @@ -562,16 +584,46 @@ FILE: ../../../flutter/impeller/image/compressed_image.cc
FILE: ../../../flutter/impeller/image/compressed_image.h
FILE: ../../../flutter/impeller/image/decompressed_image.cc
FILE: ../../../flutter/impeller/image/decompressed_image.h
FILE: ../../../flutter/impeller/playground/backend/gles/playground_impl_gles.cc
FILE: ../../../flutter/impeller/playground/backend/gles/playground_impl_gles.h
FILE: ../../../flutter/impeller/playground/backend/metal/playground_impl_mtl.h
FILE: ../../../flutter/impeller/playground/backend/metal/playground_impl_mtl.mm
FILE: ../../../flutter/impeller/playground/imgui/imgui_impl_impeller.cc
FILE: ../../../flutter/impeller/playground/imgui/imgui_impl_impeller.h
FILE: ../../../flutter/impeller/playground/imgui/imgui_raster.frag
FILE: ../../../flutter/impeller/playground/imgui/imgui_raster.vert
FILE: ../../../flutter/impeller/playground/playground.cc
FILE: ../../../flutter/impeller/playground/playground.h
FILE: ../../../flutter/impeller/playground/playground.mm
FILE: ../../../flutter/impeller/playground/playground_impl.cc
FILE: ../../../flutter/impeller/playground/playground_impl.h
FILE: ../../../flutter/impeller/playground/widgets.cc
FILE: ../../../flutter/impeller/playground/widgets.h
FILE: ../../../flutter/impeller/renderer/allocator.cc
FILE: ../../../flutter/impeller/renderer/allocator.h
FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/command_buffer_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/command_buffer_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/context_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/context_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/device_buffer_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/formats_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/pipeline_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/pipeline_library_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/pipeline_library_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/proc_table_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/proc_table_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/reactor_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/reactor_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/render_pass_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/sampler_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/sampler_library_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/shader_function_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/shader_library_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/shader_library_gles.h
FILE: ../../../flutter/impeller/renderer/backend/gles/surface_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/texture_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/gles/vertex_descriptor_gles.cc
FILE: ../../../flutter/impeller/renderer/backend/metal/allocator_mtl.h
FILE: ../../../flutter/impeller/renderer/backend/metal/allocator_mtl.mm
FILE: ../../../flutter/impeller/renderer/backend/metal/command_buffer_mtl.h
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/ios/ios_context_metal_impeller.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#import "flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h"

#include "flutter/impeller/entity/entity_shaders.h"
#include "flutter/impeller/entity/mtl/entity_shaders.h"
#include "flutter/impeller/renderer/backend/metal/context_mtl.h"

namespace flutter {
Expand Down

0 comments on commit 1c2dfbc

Please sign in to comment.