Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Stable #57282

Closed
easion wants to merge 26 commits into from
Closed

Stable #57282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d632441
Update Dart to 3.6.0-334.3.beta (#55826)
zanderso Oct 11, 2024
af0f0d5
Beta fix macos xcprivacy manifest copy location (#55938)
christopherfujino Oct 18, 2024
2ad45d5
[CP] Starts looking for the bdf fast path in relation to the snapshot…
gaaclarke Nov 5, 2024
77db576
[CP-beta] Fix memory leak during gif upload on Android/Impeller (#55928)
Nov 5, 2024
9080aa8
[cp] Removed clamping from dithering (#56140) (#56174)
gaaclarke Nov 5, 2024
8b78a34
[CP] Disable thread merging for 3.27 release branch. (#56378)
Nov 5, 2024
ada71c7
[CP][Impeller] disable Adreno 506. (#56210) (#56216)
Nov 5, 2024
e929345
[CP][Impeller] disable AHBs on devices that were upgraded to 29. (#56…
Nov 5, 2024
dcb260d
[CP][Impeller] disable Maleoon GPU from using Vulkan. (#56203) (#56207)
Nov 5, 2024
ccfd94b
[CP] Roll Skia to 6062afaa505bf7e6c727a20cafe4c7bee0f02df8 (#56546)
cbracken Nov 13, 2024
397deba
[flutter_releases] Flutter beta 3.27.0-0.2.pre Engine Cherrypicks (#5…
eyebrowsoffire Nov 14, 2024
2416efe
[CP][iOS] fix tracking of prev platform view items. (#56589)
Dec 6, 2024
85033b0
[CP-beta] Drop APNG frames that don't fit entirely within the destina…
zanderso Dec 9, 2024
6cfcdbf
[CP-beta][MANUAL][ios][platform_view] workaround for non-tappable web…
hellohuanlin Dec 9, 2024
45ac4d6
[flutter_releases] Flutter stable 3.27.0 Engine Cherrypicks (#57035)
christopherfujino Dec 9, 2024
83bacfc
[cp:beta][web] Work around wrong pointerId in coalesced events in iOS…
mdebbar Dec 10, 2024
eed6905
[CP][3.27][ios]enable the webview non tappable workaround by checking…
hellohuanlin Dec 13, 2024
57618fa
[CP][Android] Disable SurfaceControl based swapchains. (#57173)
Dec 13, 2024
cb4b5ff
[CP][Impeller] disable all Adrenos older than 630 (#57069) (#57100)
Dec 13, 2024
8c48577
[CP-stable]Move detection of cutouts in Android engine to `onApplyWin…
flutteractionsbot Jan 8, 2025
c3ea4be
[CP] Remove incorrect fml check. (#57249)
Jan 8, 2025
d11906b
[CP][Impeller] fix line/polygon depth and GLES scissor state. (#56494…
Jan 8, 2025
ce26d8b
[CP-stable][web] Don't close image source too early (#57221)
flutteractionsbot Jan 9, 2025
9c0d322
[CP-stable][web] Use `eventTarget` when computing pointer offset (#57…
flutteractionsbot Jan 9, 2025
41bb2f4
[CP-stable][web] Reland: Add `crossOrigin` property to `<img>` tag us…
Reprevise Jan 9, 2025
e672b00
[flutter_releases] Flutter stable 3.27.2 Engine Cherrypicks (#57271)
christopherfujino Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '1349ddc074ad616c6660eb29f75dafe18f3714c0',
'skia_revision': '6062afaa505bf7e6c727a20cafe4c7bee0f02df8',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -56,7 +56,7 @@ 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': 'd916a5f69a486de98316900f19ef0ff46834b03d',
'dart_revision': '1bf43bfd314768e235f6e5618842469bab6494bd',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down
124 changes: 39 additions & 85 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
Expand All @@ -15,22 +14,23 @@
},
"gn": [
"--target-dir",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--runtime-mode",
"debug",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--use-glfw-swiftshader",
"--rbe",
"--no-goma",
"--xcode-symlinks"

],
"name": "ci/host_debug_tests",
"description": "Produces debug mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_debug_arm64_tests",
"description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_debug_tests",
"config": "ci/host_debug_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -44,8 +44,9 @@
"name": "Host Tests for host_debug",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -58,29 +59,30 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--runtime-mode",
"profile",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_profile_tests",
"description": "Produces profile mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_profile_arm64_tests",
"description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_profile_tests",
"config": "ci/host_profile_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -94,8 +96,9 @@
"name": "Host Tests for host_profile",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -108,24 +111,19 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--runtime-mode",
"release",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
Expand All @@ -134,10 +132,10 @@
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_release_tests",
"description": "Produces release mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_release_arm64_tests",
"description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_release_tests",
"config": "ci/host_release_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -148,11 +146,12 @@
"tests": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"name": "Dart and engine tests for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--type",
"dart,dart-host,engine"
]
Expand Down Expand Up @@ -208,6 +207,7 @@
"name": "Impeller-golden for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/mac_release_arm64_tests",
"--type",
Expand All @@ -216,62 +216,6 @@
}
]
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_debug_unopt",
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_debug_unopt",
"description": "Builds a debug mode unopt x64 macOS engine and runs host-side tests.",
"ninja": {
"config": "ci/host_debug_unopt",
"targets": []
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "15a240d"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/host_debug_unopt",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
{
"cas_archive": false,
"properties": {
Expand Down Expand Up @@ -318,6 +262,7 @@
"name": "Tests for ios_debug_unopt_sim",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim",
"--type",
Expand Down Expand Up @@ -358,6 +303,7 @@
"--prebuilt-dart-sdk",
"--mac-cpu",
"arm64",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks",
Expand All @@ -381,13 +327,19 @@
"name": "Host Tests for host_debug_unopt_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_unopt_arm64",
"--type",
"dart,dart-host,engine,impeller-golden",
"--engine-capture-core-dump",
"--no-skia-gold"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
Expand Down Expand Up @@ -439,6 +391,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64",
"--type",
Expand Down Expand Up @@ -507,6 +460,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64_extension_safe",
"--type",
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: e41e121402f1b734a9825aaa785d49a8
Signature: 086870b9a7d2aa20c37a6b0ade0856e2

====================================================================================================
LIBRARY: etc1
Expand Down
3 changes: 0 additions & 3 deletions impeller/compiler/shader_lib/impeller/dithering.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ vec4 IPOrderedDither8x8(vec4 color, vec2 dest) {
// Apply the dither to the color.
color.rgb += dither * kDitherRate;

// Clamp the color values to [0,1].
color.rgb = clamp(color.rgb, 0.0, 1.0);

return color;
}

Expand Down
60 changes: 60 additions & 0 deletions impeller/display_list/aiks_dl_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include <vector>
#include "display_list/dl_sampling_options.h"
#include "display_list/dl_tile_mode.h"
#include "display_list/effects/dl_color_filter.h"
#include "display_list/effects/dl_color_source.h"
#include "display_list/effects/dl_image_filter.h"
#include "display_list/geometry/dl_geometry_types.h"
#include "display_list/geometry/dl_path.h"
#include "display_list/image/dl_image.h"
#include "flutter/impeller/display_list/aiks_unittests.h"

Expand All @@ -21,7 +23,9 @@
#include "impeller/display_list/dl_dispatcher.h"
#include "impeller/display_list/dl_image_impeller.h"
#include "impeller/geometry/scalar.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkMatrix.h"
#include "include/core/SkPath.h"
#include "include/core/SkRSXform.h"
#include "include/core/SkRefCnt.h"

Expand Down Expand Up @@ -974,5 +978,61 @@ TEST_P(AiksTest, CanEmptyPictureConvertToImage) {
ASSERT_TRUE(OpenPlaygroundHere(recorder_builder.Build()));
}

TEST_P(AiksTest, DepthValuesForLineMode) {
// Ensures that the additional draws created by line/polygon mode all
// have the same depth values.
DisplayListBuilder builder;

SkPath path = SkPath::Circle(100, 100, 100);

builder.DrawPath(path, DlPaint()
.setColor(DlColor::kRed())
.setDrawStyle(DlDrawStyle::kStroke)
.setStrokeWidth(5));
builder.Save();
builder.ClipPath(path);

std::vector<SkPoint> points = {
SkPoint::Make(0, -200), SkPoint::Make(400, 200), SkPoint::Make(0, -100),
SkPoint::Make(400, 300), SkPoint::Make(0, 0), SkPoint::Make(400, 400),
SkPoint::Make(0, 100), SkPoint::Make(400, 500), SkPoint::Make(0, 150),
SkPoint::Make(400, 600)};

builder.DrawPoints(DisplayListBuilder::PointMode::kLines, points.size(),
points.data(),
DlPaint().setColor(DlColor::kBlue()).setStrokeWidth(10));
builder.Restore();

ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
}

TEST_P(AiksTest, DepthValuesForPolygonMode) {
// Ensures that the additional draws created by line/polygon mode all
// have the same depth values.
DisplayListBuilder builder;

SkPath path = SkPath::Circle(100, 100, 100);

builder.DrawPath(path, DlPaint()
.setColor(DlColor::kRed())
.setDrawStyle(DlDrawStyle::kStroke)
.setStrokeWidth(5));
builder.Save();
builder.ClipPath(path);

std::vector<SkPoint> points = {
SkPoint::Make(0, -200), SkPoint::Make(400, 200), SkPoint::Make(0, -100),
SkPoint::Make(400, 300), SkPoint::Make(0, 0), SkPoint::Make(400, 400),
SkPoint::Make(0, 100), SkPoint::Make(400, 500), SkPoint::Make(0, 150),
SkPoint::Make(400, 600)};

builder.DrawPoints(DisplayListBuilder::PointMode::kPolygon, points.size(),
points.data(),
DlPaint().setColor(DlColor::kBlue()).setStrokeWidth(10));
builder.Restore();

ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
}

} // namespace testing
} // namespace impeller
Loading