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

Commit d8f7516

Browse files
jmagmanjmagman
authored
Merge branch 'main' into ios-12-buildroot
2 parents 8cd8f21 + 7e63486 commit d8f7516

47 files changed

Lines changed: 808 additions & 165 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,22 @@ targets:
6262
- lib/ui/**
6363
- shell/platform/android/**
6464

65+
# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
66+
# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
67+
- name: Linux linux_android_emulator_tests_api_33
68+
bringup: true
69+
enabled_branches:
70+
- main
71+
recipe: engine_v2/engine_v2
72+
properties:
73+
config_name: linux_android_emulator_api_33
74+
timeout: 60
75+
runIf:
76+
- .ci.yaml
77+
- DEPS
78+
- lib/ui/**
79+
- shell/platform/android/**
80+
6581
- name: Linux builder_cache
6682
enabled_branches:
6783
- main

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'dab831e8dcec2115cb1bc83fae0c12c3dd82e095',
21+
'skia_revision': 'bdd1e88f3b83fd3fb51441e5415454a7d54e548e',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

‎ci/builders/linux_android_emulator_api_33.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"builds": [
3+
{
4+
"drone_dimensions": [
5+
"device_type=none",
6+
"os=Linux",
7+
"kvm=1",
8+
"cores=8"
9+
],
10+
"gn": [
11+
"--android",
12+
"--android-cpu=x64",
13+
"--no-lto",
14+
"--rbe",
15+
"--no-goma"
16+
],
17+
"name": "android_debug_x64",
18+
"ninja": {
19+
"config": "android_debug_x64",
20+
"targets": [
21+
"flutter/shell/platform/android:flutter_shell_native_unittests",
22+
"flutter/testing/scenario_app"
23+
]
24+
},
25+
"tests": [
26+
{
27+
"language": "python3",
28+
"name": "Android Unit Tests",
29+
"test_dependencies": [
30+
{
31+
"dependency": "android_virtual_device",
32+
"version": "33"
33+
}
34+
],
35+
"contexts": [
36+
"android_virtual_device"
37+
],
38+
"script": "flutter/testing/run_tests.py",
39+
"parameters": [
40+
"--android-variant",
41+
"android_debug_x64",
42+
"--type",
43+
"android"
44+
]
45+
},
46+
{
47+
"language": "bash",
48+
"name": "Scenario App Integration Tests",
49+
"test_dependencies": [
50+
{
51+
"dependency": "android_virtual_device",
52+
"version": "33"
53+
}
54+
],
55+
"contexts": [
56+
"android_virtual_device"
57+
],
58+
"script": "flutter/testing/scenario_app/run_android_tests.sh",
59+
"parameters": [
60+
"android_debug_x64"
61+
]
62+
}
63+
]
64+
}
65+
]
66+
}

‎ci/builders/mac_ios_engine.json‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
{
2727
"drone_dimensions": [
2828
"device_type=none",
29-
"os=Mac-12|Mac-13",
30-
"cpu=x86"
29+
"os=Mac-12|Mac-13"
3130
],
3231
"gn": [
3332
"--ios",
@@ -50,8 +49,7 @@
5049
{
5150
"drone_dimensions": [
5251
"device_type=none",
53-
"os=Mac-12|Mac-13",
54-
"cpu=x86"
52+
"os=Mac-12|Mac-13"
5553
],
5654
"gn": [
5755
"--ios",
@@ -74,8 +72,7 @@
7472
{
7573
"drone_dimensions": [
7674
"device_type=none",
77-
"os=Mac-12|Mac-13",
78-
"cpu=x86"
75+
"os=Mac-12|Mac-13"
7976
],
8077
"gn": [
8178
"--ios",
@@ -99,8 +96,7 @@
9996
{
10097
"drone_dimensions": [
10198
"device_type=none",
102-
"os=Mac-12|Mac-13",
103-
"cpu=x86"
99+
"os=Mac-12|Mac-13"
104100
],
105101
"gn": [
106102
"--ios",
@@ -148,8 +144,7 @@
148144
{
149145
"drone_dimensions": [
150146
"device_type=none",
151-
"os=Mac-12|Mac-13",
152-
"cpu=x86"
147+
"os=Mac-12|Mac-13"
153148
],
154149
"gn": [
155150
"--ios",
@@ -173,8 +168,7 @@
173168
{
174169
"drone_dimensions": [
175170
"device_type=none",
176-
"os=Mac-12|Mac-13",
177-
"cpu=x86"
171+
"os=Mac-12|Mac-13"
178172
],
179173
"gn": [
180174
"--ios",
@@ -198,8 +192,7 @@
198192
{
199193
"drone_dimensions": [
200194
"device_type=none",
201-
"os=Mac-12|Mac-13",
202-
"cpu=x86"
195+
"os=Mac-12|Mac-13"
203196
],
204197
"gn": [
205198
"--ios",
@@ -224,8 +217,7 @@
224217
{
225218
"drone_dimensions": [
226219
"device_type=none",
227-
"os=Mac-12|Mac-13",
228-
"cpu=x86"
220+
"os=Mac-12|Mac-13"
229221
],
230222
"gn": [
231223
"--ios",

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5231,6 +5231,9 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.gls
52315231
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert + ../../../flutter/LICENSE
52325232
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag + ../../../flutter/LICENSE
52335233
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag + ../../../flutter/LICENSE
5234+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl + ../../../flutter/LICENSE
5235+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag + ../../../flutter/LICENSE
5236+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag + ../../../flutter/LICENSE
52345237
ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/points.comp + ../../../flutter/LICENSE
52355238
ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/uv.comp + ../../../flutter/LICENSE
52365239
ORIGIN: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag + ../../../flutter/LICENSE
@@ -8041,6 +8044,9 @@ FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
80418044
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
80428045
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
80438046
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
8047+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl
8048+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag
8049+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag
80448050
FILE: ../../../flutter/impeller/entity/shaders/geometry/points.comp
80458051
FILE: ../../../flutter/impeller/entity/shaders/geometry/uv.comp
80468052
FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag

‎ci/licenses_golden/licenses_skia‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5d8007543b86ccbe41fc5ca965989deb
1+
Signature: ef246654f677b0a61d98bcf417a8f4aa
22

33
====================================================================================================
44
LIBRARY: etc1

‎impeller/entity/BUILD.gn‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ impeller_shaders("entity_shaders") {
2828
"shaders/gaussian_blur/gaussian_blur.vert",
2929
"shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag",
3030
"shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag",
31+
"shaders/gaussian_blur/kernel_decal.frag",
32+
"shaders/gaussian_blur/kernel_nodecal.frag",
3133
"shaders/glyph_atlas.frag",
3234
"shaders/glyph_atlas_color.frag",
3335
"shaders/glyph_atlas.vert",
@@ -245,6 +247,7 @@ impeller_component("entity") {
245247
}
246248

247249
deps = [ "//flutter/fml" ]
250+
defines = [ "_USE_MATH_DEFINES" ]
248251
}
249252

250253
impeller_component("entity_test_helpers") {

‎impeller/entity/contents/atlas_contents.cc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,7 @@ bool AtlasContents::Render(const ContentContext& renderer,
277277

278278
FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
279279

280-
frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
281-
entity.GetTransform();
280+
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform();
282281

283282
auto uniform_view = host_buffer.EmplaceUniform(frame_info);
284283
VS::BindFrameInfo(cmd, uniform_view);
@@ -409,8 +408,7 @@ bool AtlasTextureContents::Render(const ContentContext& renderer,
409408
auto& host_buffer = pass.GetTransientsBuffer();
410409

411410
VS::FrameInfo frame_info;
412-
frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
413-
entity.GetTransform();
411+
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform();
414412
frame_info.texture_sampler_y_coord_scale = texture->GetYCoordScale();
415413
frame_info.alpha = alpha_;
416414

@@ -497,8 +495,7 @@ bool AtlasColorContents::Render(const ContentContext& renderer,
497495
auto& host_buffer = pass.GetTransientsBuffer();
498496

499497
VS::FrameInfo frame_info;
500-
frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
501-
entity.GetTransform();
498+
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform();
502499

503500
FS::FragInfo frag_info;
504501
frag_info.alpha = alpha_;

‎impeller/entity/contents/clip_contents.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ bool ClipContents::Render(const ContentContext& renderer,
9999
.CreateVertexBuffer(pass.GetTransientsBuffer());
100100
cmd.BindVertices(std::move(vertices));
101101

102-
info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize());
102+
info.mvp = pass.GetOrthographicTransform();
103103
VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
104104

105105
options.primitive_type = PrimitiveType::kTriangleStrip;
@@ -200,7 +200,7 @@ bool ClipRestoreContents::Render(const ContentContext& renderer,
200200
cmd.BindVertices(vtx_builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
201201

202202
VS::FrameInfo info;
203-
info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize());
203+
info.mvp = pass.GetOrthographicTransform();
204204
VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
205205

206206
pass.AddCommand(std::move(cmd));

‎impeller/entity/contents/conical_gradient_contents.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ bool ConicalGradientContents::RenderSSBO(const ContentContext& renderer,
8989
DefaultUniformAlignment());
9090

9191
VS::FrameInfo frame_info;
92-
frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
93-
entity.GetTransform();
92+
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform();
9493
frame_info.matrix = GetInverseEffectTransform();
9594

9695
Command cmd;

0 commit comments

Comments
 (0)