zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

[Impeller] Always pop clips on restore. (flutter/engine#50419)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/142846

We need to always resolve clips when `Restore()` is called. Before, I just had it resolving the clips for canvas xformation stack entires created via `SaveLayer`.
This commit is contained in:
Brandon DeRosier
2024-02-06 21:17:10 -08:00
committed by GitHub
parent 6c88cab2c4
commit e4e1d5cc21
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/src/flutter/impeller/aiks/aiks_unittests.cc
View File

@@ -3502,12 +3502,26 @@ TEST_P(AiksTest, ImageColorSourceEffectTransform) {
TEST_P(AiksTest, CorrectClipDepthAssignedToEntities) {
Canvas canvas; // Depth 1 (base pass)
canvas.DrawRRect(Rect::MakeLTRB(0, 0, 100, 100), {10, 10}, {}); // Depth 2
canvas.ClipRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {}); // Depth 4
canvas.SaveLayer({}); // Depth 3
canvas.DrawRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {}); // Depth 4
canvas.Save();
{
canvas.ClipRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {}); // Depth 5
canvas.SaveLayer({}); // Depth 3
{
canvas.DrawRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {}); // Depth 4
}
canvas.Restore(); // Restore the savelayer.
}
canvas.Restore(); // Depth 5 -- this will no longer append a restore entity
// once we switch to the clip depth approach.
auto picture = canvas.EndRecordingAsPicture();
std::array<uint32_t, 4> expected = {2, 4, 3, 4};
std::array<uint32_t, 5> expected = {
2, // DrawRRect
4, // ClipRRect
3, // SaveLayer
4, // DrawRRect
5, // Restore (will be removed once we switch to the clip depth approach)
};
std::vector<uint32_t> actual;
picture.pass->IterateAllElements([&](EntityPass::Element& element) -> bool {

3
engine/src/flutter/impeller/aiks/canvas.cc
View File

@@ -210,9 +210,10 @@ bool Canvas::Restore() {
return false;
}
size_t num_clips = transform_stack_.back().num_clips;
current_pass_->PopClips(num_clips, current_depth_);
if (transform_stack_.back().rendering_mode ==
Entity::RenderingMode::kSubpass) {
current_pass_->PopClips(num_clips, current_depth_);
current_pass_ = GetCurrentPass().GetSuperpass();
FML_DCHECK(current_pass_);
}