Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa54bd1d authored by Ram Indani's avatar Ram Indani Committed by Automerger Merge Worker
Browse files

Merge "Set isOpaque For BlendMode::None" into tm-dev am: cf45b358 am: a6d0e5fb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17904868



Change-Id: Ie9e148e7789103fb3453508a8cfd391d16beecc4
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d62a1497 a6d0e5fb

graphics/composer/aidl/vts/ReadbackVts.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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));

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)