summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorramindani <ramindani@google.com>2022-04-15 18:30:41 +0000
committerRam Indani <ramindani@google.com>2022-04-22 16:25:39 +0000
commitc7585d9dc4a26d0e04b8d81e10b67235f0015d47 (patch)
treeb3cc3319266782e3d16e2d18abb614ca8cdb7283 /graphics
parentd354a98041092207915c7fbf7f622c33429eb085 (diff)
Set isOpaque For BlendMode::None
Test: atest VtsHalGraphicsComposer3_TargetTest BUG: 216205298 BUG: 219576457 Change-Id: I479d8367e5abf8893b94ac64b7149a2f0e4cf75b
Diffstat (limited to 'graphics')
-rw-r--r--graphics/composer/aidl/vts/ReadbackVts.cpp1
-rw-r--r--graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/graphics/composer/aidl/vts/ReadbackVts.cpp b/graphics/composer/aidl/vts/ReadbackVts.cpp
index 03b1b6ca12..abb58e25dd 100644
--- a/graphics/composer/aidl/vts/ReadbackVts.cpp
+++ b/graphics/composer/aidl/vts/ReadbackVts.cpp
@@ -76,6 +76,7 @@ LayerSettings TestLayer::toRenderEngineLayerSettings() {
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));
diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
index c081199ba6..72ff9babed 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
@@ -1132,8 +1132,8 @@ class GraphicsBlendModeCompositionTest
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)