[Impeller] distinguish between no clear color and transparent black clear color. (#49038)
If we clear to transparent black, we're not forcing the pass to be constructed. Change the entity pass API so that we can tell the difference between clearing transparent black and not having a clear color.
In https://github.com/flutter/flutter/issues/139571 , the app is creating a layer that is clearing to a transparent color, which is getting skipped. That invalid texture is fed into a blend which produces either black or magenta error texture.
Fixes https://github.com/flutter/flutter/issues/139571
diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc
index 9a550b0..94e8b7f 100644
--- a/impeller/aiks/aiks_unittests.cc
+++ b/impeller/aiks/aiks_unittests.cc
@@ -2953,19 +2953,18 @@
Picture picture = canvas.EndRecordingAsPicture();
std::optional<Color> actual_color;
+ bool found_subpass = false;
picture.pass->IterateAllElements([&](EntityPass::Element& element) -> bool {
if (auto subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
actual_color = subpass->get()->GetClearColor();
+ found_subpass = true;
}
// Fail if the first element isn't a subpass.
return true;
});
- ASSERT_TRUE(actual_color.has_value());
- if (!actual_color) {
- return;
- }
- ASSERT_EQ(actual_color.value(), Color::BlackTransparent());
+ EXPECT_TRUE(found_subpass);
+ EXPECT_FALSE(actual_color.has_value());
}
TEST_P(AiksTest, CollapsedDrawPaintInSubpass) {
@@ -4625,5 +4624,27 @@
ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
}
+TEST_P(AiksTest, SubpassWithClearColorOptimization) {
+ Canvas canvas;
+
+ // Use a non-srcOver blend mode to ensure that we don't detect this as an
+ // opacity peephole optimization.
+ canvas.SaveLayer(
+ {.color = Color::Blue().WithAlpha(0.5), .blend_mode = BlendMode::kSource},
+ Rect::MakeLTRB(0, 0, 200, 200));
+ canvas.DrawPaint(
+ {.color = Color::BlackTransparent(), .blend_mode = BlendMode::kSource});
+ canvas.Restore();
+
+ canvas.SaveLayer(
+ {.color = Color::Blue(), .blend_mode = BlendMode::kDestinationOver});
+ canvas.Restore();
+
+ // This playground should appear blank on CI since we are only drawing
+ // transparent black. If the clear color optimization is broken, the texture
+ // will be filled with NaNs and may produce a magenta texture on macOS or iOS.
+ ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
} // namespace testing
} // namespace impeller
diff --git a/impeller/aiks/paint_pass_delegate.cc b/impeller/aiks/paint_pass_delegate.cc
index 2b249ed..fe42af0 100644
--- a/impeller/aiks/paint_pass_delegate.cc
+++ b/impeller/aiks/paint_pass_delegate.cc
@@ -10,7 +10,6 @@
#include "impeller/entity/contents/texture_contents.h"
#include "impeller/entity/entity_pass.h"
#include "impeller/geometry/color.h"
-#include "impeller/geometry/path_builder.h"
namespace impeller {
diff --git a/impeller/entity/entity_pass.cc b/impeller/entity/entity_pass.cc
index 4ac6182..f513116 100644
--- a/impeller/entity/entity_pass.cc
+++ b/impeller/entity/entity_pass.cc
@@ -19,7 +19,6 @@
#include "impeller/entity/contents/filters/color_filter_contents.h"
#include "impeller/entity/contents/filters/inputs/filter_input.h"
#include "impeller/entity/contents/framebuffer_blend_contents.h"
-#include "impeller/entity/contents/solid_color_contents.h"
#include "impeller/entity/contents/texture_contents.h"
#include "impeller/entity/entity.h"
#include "impeller/entity/inline_pass_context.h"
@@ -340,9 +339,9 @@
// and then blit the results onto the onscreen texture. If using this branch,
// there's no need to set up a stencil attachment on the root render target.
if (reads_from_onscreen_backdrop) {
- auto offscreen_target =
- CreateRenderTarget(renderer, root_render_target.GetRenderTargetSize(),
- GetClearColor(render_target.GetRenderTargetSize()));
+ auto offscreen_target = CreateRenderTarget(
+ renderer, root_render_target.GetRenderTargetSize(),
+ GetClearColorOrDefault(render_target.GetRenderTargetSize()));
if (!OnRender(renderer, // renderer
capture, // capture
@@ -447,7 +446,8 @@
}
// Set up the clear color of the root pass.
- color0.clear_color = GetClearColor(render_target.GetRenderTargetSize());
+ color0.clear_color =
+ GetClearColorOrDefault(render_target.GetRenderTargetSize());
root_render_target.SetColorAttachment(color0, 0);
EntityPassTarget pass_target(
@@ -600,9 +600,9 @@
}
auto subpass_target = CreateRenderTarget(
- renderer, // renderer
- subpass_size, // size
- subpass->GetClearColor(subpass_size)); // clear_color
+ renderer, // renderer
+ subpass_size, // size
+ subpass->GetClearColorOrDefault(subpass_size)); // clear_color
if (!subpass_target.IsValid()) {
VALIDATION_LOG << "Subpass render target is invalid.";
@@ -845,8 +845,7 @@
}
auto clear_color_size = pass_target.GetRenderTarget().GetRenderTargetSize();
- if (!collapsed_parent_pass &&
- !GetClearColor(clear_color_size).IsTransparent()) {
+ if (!collapsed_parent_pass && GetClearColor(clear_color_size).has_value()) {
// Force the pass context to create at least one new pass if the clear color
// is present.
pass_context.GetRenderPass(pass_depth);
@@ -958,7 +957,7 @@
// If all previous elements were skipped due to clear color
// optimization, then provide the clear color as the foreground of the
// advanced blend.
- foreground_color = GetClearColor(clear_color_size);
+ foreground_color = GetClearColorOrDefault(clear_color_size);
coverage = Rect::MakeSize(clear_color_size);
} else {
coverage = result.entity.GetCoverage();
@@ -1139,21 +1138,29 @@
flood_clip_ = Entity::IsBlendModeDestructive(blend_mode);
}
-Color EntityPass::GetClearColor(ISize target_size) const {
- Color result = Color::BlackTransparent();
+Color EntityPass::GetClearColorOrDefault(ISize size) const {
+ return GetClearColor(size).value_or(Color::BlackTransparent());
+}
+
+std::optional<Color> EntityPass::GetClearColor(ISize target_size) const {
if (backdrop_filter_proc_) {
- return result;
+ return std::nullopt;
}
+ std::optional<Color> result = std::nullopt;
for (const Element& element : elements_) {
auto [entity_color, blend_mode] =
ElementAsBackgroundColor(element, target_size);
if (!entity_color.has_value()) {
break;
}
- result = result.Blend(entity_color.value(), blend_mode);
+ result = result.value_or(Color::BlackTransparent())
+ .Blend(entity_color.value(), blend_mode);
}
- return result.Premultiply();
+ if (result.has_value()) {
+ return result->Premultiply();
+ }
+ return result;
}
void EntityPass::SetBackdropFilter(BackdropFilterProc proc) {
diff --git a/impeller/entity/entity_pass.h b/impeller/entity/entity_pass.h
index 1ff08f0..39f5449 100644
--- a/impeller/entity/entity_pass.h
+++ b/impeller/entity/entity_pass.h
@@ -136,7 +136,13 @@
void SetBlendMode(BlendMode blend_mode);
- Color GetClearColor(ISize size = ISize::Infinite()) const;
+ /// @brief Return the premultiplied clear color of the pass entities, if any.
+ std::optional<Color> GetClearColor(ISize size = ISize::Infinite()) const;
+
+ /// @brief Return the premultiplied clear color of the pass entities.
+ ///
+ /// If the entity pass has no clear color, this will return transparent black.
+ Color GetClearColorOrDefault(ISize size = ISize::Infinite()) const;
void SetBackdropFilter(BackdropFilterProc proc);
