diff options
| author | Ram Indani <ramindani@google.com> | 2022-04-22 19:26:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-22 19:26:54 +0000 |
| commit | cf45b358a50dd2e2efe53e374e7724e117855f86 (patch) | |
| tree | b9a0c010e67eec9beb3c7c219a872dee4a827239 | |
| parent | 9a7e193760bf3b5c1269f6b69af3f809a4a9e99d (diff) | |
| parent | c7585d9dc4a26d0e04b8d81e10b67235f0015d47 (diff) | |
Merge "Set isOpaque For BlendMode::None" into tm-dev
| -rw-r--r-- | graphics/composer/aidl/vts/ReadbackVts.cpp | 1 | ||||
| -rw-r--r-- | graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp | 4 |
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) |