Skip to content

Commit 2e8f991

Browse files
committed
Fix square corners issue by preserving parent clips and correcting depth accounting
1 parent c180b42 commit 2e8f991

10 files changed

Lines changed: 339 additions & 35 deletions

File tree

‎engine/src/flutter/impeller/display_list/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ template("aiks_unittests_component") {
201201
"//flutter/impeller/geometry:geometry_asserts",
202202
"//flutter/impeller/golden_tests:golden_playground_test",
203203
"//flutter/impeller/playground:playground_test",
204+
"//flutter/impeller/renderer/testing:mocks",
204205
"//flutter/testing:testing_lib",
205206
"//flutter/txt",
206207
]

‎engine/src/flutter/impeller/display_list/aiks_dl_clip_unittests.cc‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include "flutter/display_list/dl_color.h"
1010
#include "flutter/display_list/dl_paint.h"
1111
#include "flutter/display_list/effects/dl_color_filter.h"
12+
#include "flutter/display_list/effects/dl_image_filter.h"
13+
#include "flutter/display_list/geometry/dl_geometry_types.h"
1214
#include "flutter/display_list/geometry/dl_path_builder.h"
1315
#include "flutter/testing/testing.h"
1416

@@ -139,5 +141,80 @@ TEST_P(AiksTest, FramebufferBlendsRespectClips) {
139141
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
140142
}
141143

144+
TEST_P(AiksTest, CanRenderClippedBackdropFilterWithSuperellipse) {
145+
DisplayListBuilder root_builder;
146+
147+
root_builder.Scale(GetContentScale().x, GetContentScale().y);
148+
149+
// 1. Draw a dark background on the root pass.
150+
DlPaint bg_paint;
151+
bg_paint.setColor(DlColor::kBlack());
152+
root_builder.DrawPaint(bg_paint);
153+
154+
// 2. Wrap in TransformLayer (matching CupertinoSheetTransition scale +
155+
// slide).
156+
root_builder.Save();
157+
root_builder.Scale(0.9f, 0.9f);
158+
root_builder.Translate(33.4f, 3.5f);
159+
160+
// 3. Apply ClipRoundSuperellipse with top-only rounded corners (matching
161+
// CupertinoSheet).
162+
DlRect sheet_rect = DlRect::MakeXYWH(0, 42, 400, 500);
163+
DlRoundingRadii top_radii = {
164+
.top_left = {12, 12},
165+
.top_right = {12, 12},
166+
.bottom_left = {0, 0},
167+
.bottom_right = {0, 0},
168+
};
169+
DlRoundSuperellipse clip_rse =
170+
DlRoundSuperellipse::MakeRectRadii(sheet_rect, top_radii);
171+
root_builder.ClipRoundSuperellipse(clip_rse, DlClipOp::kIntersect);
172+
173+
// 4. Wrap in OpacityLayer offset (matching CupertinoSheetRoute offset: (0,
174+
// 42)).
175+
root_builder.Save();
176+
root_builder.Translate(0.0f, 42.0f);
177+
178+
// 5. Layer 1: DisplayListLayer for sheet body with Ink features.
179+
for (int i = 0; i < 5; i++) {
180+
DisplayListBuilder item_builder;
181+
DlPaint ink_paint;
182+
ink_paint.setColor(DlColor::RGBA(0.0f, 0.0f, 0.0f, 0.07f));
183+
item_builder.DrawRect(DlRect::MakeXYWH(0, i * 50, 400, 45), ink_paint);
184+
root_builder.DrawDisplayList(item_builder.Build());
185+
}
186+
187+
// 6. Layer 2: BackdropFilterLayer (_glassBar).
188+
root_builder.Save();
189+
DlRect glass_rect = DlRect::MakeXYWH(20, 350, 360, 60);
190+
DlRoundRect glass_rrect = DlRoundRect::MakeRectXY(glass_rect, 14, 14);
191+
root_builder.ClipRoundRect(glass_rrect, DlClipOp::kIntersect);
192+
193+
DlPaint save_paint;
194+
auto backdrop_filter =
195+
DlImageFilter::MakeBlur(12.0f, 12.0f, DlTileMode::kClamp);
196+
root_builder.SaveLayer(glass_rect, &save_paint, backdrop_filter.get());
197+
DisplayListBuilder glass_builder;
198+
DlPaint orange_paint;
199+
orange_paint.setColor(DlColor::RGBA(1.0f, 0.6f, 0.0f, 0.6f));
200+
glass_builder.DrawRect(glass_rect, orange_paint);
201+
root_builder.DrawDisplayList(glass_builder.Build());
202+
root_builder.Restore(); // Restore SaveLayer
203+
root_builder.Restore(); // Restore glass clip
204+
205+
// 7. Layer 3: DisplayListLayer for Scaffold AppBar / header drawn AFTER
206+
// backdrop filter.
207+
DisplayListBuilder appbar_builder;
208+
DlPaint white_paint;
209+
white_paint.setColor(DlColor::kWhite());
210+
appbar_builder.DrawRect(DlRect::MakeXYWH(0, 0, 400, 80), white_paint);
211+
root_builder.DrawDisplayList(appbar_builder.Build());
212+
213+
root_builder.Restore(); // Restore OpacityLayer offset
214+
root_builder.Restore(); // Restore TransformLayer
215+
216+
ASSERT_TRUE(OpenPlaygroundHere(root_builder.Build()));
217+
}
218+
142219
} // namespace testing
143220
} // namespace impeller

‎engine/src/flutter/impeller/display_list/canvas.cc‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,10 +1781,10 @@ void Canvas::Save(uint32_t total_content_depth) {
17811781
auto entry = CanvasStackEntry{};
17821782
entry.transform = transform_stack_.back().transform;
17831783
entry.clip_depth = current_depth_ + total_content_depth;
1784-
entry.distributed_opacity = transform_stack_.back().distributed_opacity;
17851784
FML_DCHECK(entry.clip_depth <= transform_stack_.back().clip_depth)
17861785
<< entry.clip_depth << " <=? " << transform_stack_.back().clip_depth
17871786
<< " after allocating " << total_content_depth;
1787+
entry.distributed_opacity = transform_stack_.back().distributed_opacity;
17881788
entry.clip_height = transform_stack_.back().clip_height;
17891789
entry.rendering_mode = Entity::RenderingMode::kDirect;
17901790
transform_stack_.push_back(entry);
@@ -1947,7 +1947,7 @@ void Canvas::SaveLayer(const Paint& paint,
19471947
// 3. The current render pass is for the onscreen pass.
19481948
const bool should_use_onscreen =
19491949
renderer_.GetDeviceCapabilities().SupportsFramebufferFetch() &&
1950-
backdrop_count_ == 0 && render_passes_.size() == 1u;
1950+
backdrop_count_ == 0 && render_passes_.size() == 1u && is_onscreen_;
19511951
input_texture = FlipBackdrop(
19521952
GetGlobalPassPosition(), //
19531953
/*should_remove_texture=*/will_cache_backdrop_texture, //
@@ -2081,9 +2081,16 @@ bool Canvas::Restore() {
20812081
// to be overly conservative, but we need to jump the depth to
20822082
// the clip depth so that the next rendering op will get a
20832083
// larger depth (it will pre-increment the current_depth_ value).
2084-
FML_DCHECK(current_depth_ <= transform_stack_.back().clip_depth)
2085-
<< current_depth_ << " <=? " << transform_stack_.back().clip_depth;
2086-
current_depth_ = transform_stack_.back().clip_depth;
2084+
//
2085+
// Only advance depth if clips were recorded and the allocated clip depth
2086+
// was finite. This prevents premature exhaustion of the parent pass depth
2087+
// budget.
2088+
if (transform_stack_.back().num_clips > 0 &&
2089+
transform_stack_.back().clip_depth < kMaxDepth) {
2090+
FML_DCHECK(current_depth_ <= transform_stack_.back().clip_depth)
2091+
<< current_depth_ << " <=? " << transform_stack_.back().clip_depth;
2092+
current_depth_ = transform_stack_.back().clip_depth;
2093+
}
20872094

20882095
if (IsSkipping()) {
20892096
transform_stack_.pop_back();
@@ -2646,8 +2653,6 @@ std::shared_ptr<Texture> Canvas::FlipBackdrop(Point global_pass_position,
26462653
}
26472654
}
26482655

2649-
// Restore any clips that were recorded before the backdrop filter was
2650-
// applied.
26512656
auto& replay_entities = clip_coverage_stack_.GetReplayEntities();
26522657
uint64_t current_depth =
26532658
post_depth_increment ? current_depth_ - 1 : current_depth_;
@@ -2659,7 +2664,7 @@ std::shared_ptr<Texture> Canvas::FlipBackdrop(Point global_pass_position,
26592664
SetClipScissor(replay.clip_coverage, current_render_pass,
26602665
global_pass_position);
26612666
if (!replay.clip_contents.Render(renderer_, current_render_pass,
2662-
replay.clip_depth)) {
2667+
replay.clip_depth, replay.transform)) {
26632668
VALIDATION_LOG << "Failed to render entity for clip restore.";
26642669
}
26652670
}

‎engine/src/flutter/impeller/display_list/canvas.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ class LazyRenderingConfig {
121121

122122
class Canvas {
123123
public:
124-
static constexpr uint32_t kMaxDepth = 1 << 24;
124+
/// Maximum discrete integer depth level within the 18-bit depth precision
125+
/// limit defined by `Entity::kDepthEpsilon`.
126+
static constexpr uint32_t kMaxDepth = (1 << 18) - 1;
125127

126128
Canvas(ContentContext& renderer,
127129
const RenderTarget& render_target,

0 commit comments

Comments
 (0)