From 6c034b539d24c6f967766dbf4037075e607b60dc Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Fri, 23 Jul 2021 10:57:36 -0700 Subject: SF: add a solid background when hole punching a cached set When we punch a hole to round the corners on a PIP window we need to make sure that the cached set is opaque to prevent blending of the rounded corner edges with random opaque buffers. Bug: 194307461 Test: PIP window on solid color wallpaper Change-Id: I5ab80103dc5b43db85c4f12c9efd5ba2a1dfd076 --- .../CompositionEngine/src/planner/CachedSet.cpp | 10 +++++ .../tests/planner/CachedSetTest.cpp | 45 ++++++++++++++++------ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp b/services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp index b24274e731..835f6bf3fc 100644 --- a/services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp +++ b/services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp @@ -218,6 +218,7 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, TexturePool& te } renderengine::LayerSettings holePunchSettings; + renderengine::LayerSettings holePunchBackgroundSettings; if (mHolePunchLayer) { auto clientCompositionList = mHolePunchLayer->getOutputLayer()->getLayerFE().prepareClientCompositionList( @@ -232,6 +233,15 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, TexturePool& te holePunchSettings.alpha = 0.0f; holePunchSettings.name = std::string("hole punch layer"); layerSettingsPointers.push_back(&holePunchSettings); + + // Add a solid background as the first layer in case there is no opaque + // buffer behind the punch hole + holePunchBackgroundSettings.alpha = 1.0f; + holePunchBackgroundSettings.name = std::string("holePunchBackground"); + holePunchBackgroundSettings.geometry.boundaries = holePunchSettings.geometry.boundaries; + holePunchBackgroundSettings.geometry.positionTransform = + holePunchSettings.geometry.positionTransform; + layerSettingsPointers.insert(layerSettingsPointers.begin(), &holePunchBackgroundSettings); } if (sDebugHighlighLayers) { diff --git a/services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp b/services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp index b05a594a92..5db27fa6c9 100644 --- a/services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp +++ b/services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp @@ -590,12 +590,22 @@ TEST_F(CachedSetTest, addHolePunch) { base::unique_fd&&, base::unique_fd*) -> size_t { // If the highlight layer is enabled, it will increase the size by 1. // We're interested in the third layer either way. - EXPECT_GE(layers.size(), 3u); - const auto* holePunchSettings = layers[2]; - EXPECT_EQ(nullptr, holePunchSettings->source.buffer.buffer); - EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchSettings->source.solidColor); - EXPECT_TRUE(holePunchSettings->disableBlending); - EXPECT_EQ(0.0f, holePunchSettings->alpha); + EXPECT_GE(layers.size(), 4u); + { + const auto* holePunchSettings = layers[3]; + EXPECT_EQ(nullptr, holePunchSettings->source.buffer.buffer); + EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchSettings->source.solidColor); + EXPECT_TRUE(holePunchSettings->disableBlending); + EXPECT_EQ(0.0f, holePunchSettings->alpha); + } + + { + const auto* holePunchBackgroundSettings = layers[0]; + EXPECT_EQ(nullptr, holePunchBackgroundSettings->source.buffer.buffer); + EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchBackgroundSettings->source.solidColor); + EXPECT_FALSE(holePunchBackgroundSettings->disableBlending); + EXPECT_EQ(1.0f, holePunchBackgroundSettings->alpha); + } return NO_ERROR; }; @@ -640,12 +650,23 @@ TEST_F(CachedSetTest, addHolePunch_noBuffer) { base::unique_fd&&, base::unique_fd*) -> size_t { // If the highlight layer is enabled, it will increase the size by 1. // We're interested in the third layer either way. - EXPECT_GE(layers.size(), 3u); - const auto* holePunchSettings = layers[2]; - EXPECT_EQ(nullptr, holePunchSettings->source.buffer.buffer); - EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchSettings->source.solidColor); - EXPECT_TRUE(holePunchSettings->disableBlending); - EXPECT_EQ(0.0f, holePunchSettings->alpha); + EXPECT_GE(layers.size(), 4u); + + { + const auto* holePunchSettings = layers[3]; + EXPECT_EQ(nullptr, holePunchSettings->source.buffer.buffer); + EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchSettings->source.solidColor); + EXPECT_TRUE(holePunchSettings->disableBlending); + EXPECT_EQ(0.0f, holePunchSettings->alpha); + } + + { + const auto* holePunchBackgroundSettings = layers[0]; + EXPECT_EQ(nullptr, holePunchBackgroundSettings->source.buffer.buffer); + EXPECT_EQ(half3(0.0f, 0.0f, 0.0f), holePunchBackgroundSettings->source.solidColor); + EXPECT_FALSE(holePunchBackgroundSettings->disableBlending); + EXPECT_EQ(1.0f, holePunchBackgroundSettings->alpha); + } return NO_ERROR; }; -- cgit v1.2.3