commit c7585d9dc4a26d0e04b8d81e10b67235f0015d47
author ramindani <ramindani@google.com> Fri Apr 15 18:30:41 2022 +0000
committer Ram Indani <ramindani@google.com> Fri Apr 22 16:25:39 2022 +0000
tree b3cc3319266782e3d16e2d18abb614ca8cdb7283
parent d354a98041092207915c7fbf7f622c33429eb085

Set isOpaque For BlendMode::None

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 216205298
BUG: 219576457

Change-Id: I479d8367e5abf8893b94ac64b7149a2f0e4cf75b

graphics/composer/aidl/vts/ReadbackVts.cpp

diff --git a/graphics/composer/aidl/vts/ReadbackVts.cpp b/graphics/composer/aidl/vts/ReadbackVts.cpp
index 03b1b6c..abb58e2 100644
--- a/graphics/composer/aidl/vts/ReadbackVts.cpp
+++ b/graphics/composer/aidl/vts/ReadbackVts.cpp
@@ -76,6 +76,7 @@
 
     layerSettings.alpha = ::android::half(mAlpha);
     layerSettings.disableBlending = mBlendMode == BlendMode::NONE;
+    layerSettings.source.buffer.isOpaque = mBlendMode == BlendMode::NONE;
     layerSettings.geometry.boundaries = ::android::FloatRect(
             static_cast<float>(mDisplayFrame.left), static_cast<float>(mDisplayFrame.top),
             static_cast<float>(mDisplayFrame.right), static_cast<float>(mDisplayFrame.bottom));

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
index c081199..72ff9ba 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
@@ -1132,8 +1132,8 @@
     Color mBackgroundColor;
     Color mTopLayerColor;
 };
-// TODO(b/219576457) Enable tests once we have fixed the bug on composer.
-TEST_P(GraphicsBlendModeCompositionTest, DISABLED_None) {
+
+TEST_P(GraphicsBlendModeCompositionTest, None) {
     for (ColorMode mode : mTestColorModes) {
         EXPECT_TRUE(mComposerClient
                             ->setColorMode(getPrimaryDisplayId(), mode, RenderIntent::COLORIMETRIC)