Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
../../../flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc
../../../flutter/impeller/entity/contents/vertices_contents_unittests.cc
../../../flutter/impeller/entity/entity_pass_target_unittests.cc
../../../flutter/impeller/entity/entity_pass_unittests.cc
../../../flutter/impeller/entity/entity_unittests.cc
../../../flutter/impeller/entity/geometry/geometry_unittests.cc
../../../flutter/impeller/entity/render_target_cache_unittests.cc
Expand Down
1 change: 1 addition & 0 deletions impeller/entity/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ impeller_component("entity_unittests") {
"contents/tiled_texture_contents_unittests.cc",
"contents/vertices_contents_unittests.cc",
"entity_pass_target_unittests.cc",
"entity_pass_unittests.cc",
"entity_playground.cc",
"entity_playground.h",
"entity_unittests.cc",
Expand Down
8 changes: 6 additions & 2 deletions impeller/entity/entity_pass.cc
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,9 @@ bool EntityPass::RenderElement(Entity& element_entity,

if constexpr (ContentContext::kEnableStencilThenCover) {
// Skip all clip restores when stencil-then-cover is enabled.
clip_replay_->RecordEntity(element_entity, clip_coverage.type);
if (clip_coverage_stack.back().coverage.has_value()) {
clip_replay_->RecordEntity(element_entity, clip_coverage.type);
}
return true;
}

Expand Down Expand Up @@ -1269,7 +1271,9 @@ void EntityPassClipRecorder::RecordEntity(const Entity& entity,
rendered_clip_entities_.push_back(entity.Clone());
break;
case Contents::ClipCoverage::Type::kRestore:
rendered_clip_entities_.pop_back();
if (!rendered_clip_entities_.empty()) {
rendered_clip_entities_.pop_back();
}
break;
}
}
Expand Down
52 changes: 52 additions & 0 deletions impeller/entity/entity_pass_unittests.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/testing/testing.h"
#include "gtest/gtest.h"
#include "impeller/entity/entity_pass.h"

namespace impeller {
namespace testing {

TEST(EntityPassClipRecorderTest, CanPushAndPopEntities) {
EntityPassClipRecorder recorder = EntityPassClipRecorder();

EXPECT_TRUE(recorder.GetReplayEntities().empty());

Entity entity;
recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kAppend);
EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);

recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kAppend);
EXPECT_EQ(recorder.GetReplayEntities().size(), 2u);

recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore);
EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);

recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore);
EXPECT_TRUE(recorder.GetReplayEntities().empty());
}

TEST(EntityPassClipRecorderTest, CanPopEntitiesSafely) {
EntityPassClipRecorder recorder = EntityPassClipRecorder();

EXPECT_TRUE(recorder.GetReplayEntities().empty());

Entity entity;
recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore);
EXPECT_TRUE(recorder.GetReplayEntities().empty());
}

TEST(EntityPassClipRecorderTest, CanAppendNoChange) {
EntityPassClipRecorder recorder = EntityPassClipRecorder();

EXPECT_TRUE(recorder.GetReplayEntities().empty());

Entity entity;
recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kNoChange);
EXPECT_TRUE(recorder.GetReplayEntities().empty());
}

} // namespace testing
} // namespace impeller