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

Commit 0eb753e5 authored by Adrian Roos's avatar Adrian Roos
Browse files

SurfaceFlinger: Fix GL composition of ColorLayers 

Fixes an issue where the alpha for ColorLayers during
GL composition was taken from the drawing state instead
of walking the hierarchy.

This resulted in ColorLayers being drawn at the wrong
opacity during transitions whenever we dropped out of
HWC.

Bug: 74220420
Test: Developer Settings > Disable HW overlays, then launch Chrome from Home, repeatedly, verify no black frame is visible.
Change-Id: Iec94812485fa27af08cb72f875e7be3b946822a7
parent f228d589

services/surfaceflinger/ColorLayer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ ColorLayer::ColorLayer(SurfaceFlinger* flinger, const sp<Client>& client, const 


void ColorLayer::onDraw(const RenderArea& renderArea, const Region& /* clip */,

                        bool useIdentityTransform) const {

    const State& s(getDrawingState());

    if (s.color.a > 0) {

    half4 color = getColor();

    if (color.a > 0) {

        Mesh mesh(Mesh::TRIANGLE_FAN, 4, 2);

        computeGeometry(renderArea, mesh, useIdentityTransform);

        auto& engine(mFlinger->getRenderEngine());

        engine.setupLayerBlending(getPremultipledAlpha(), false /* opaque */,

                                  true /* disableTexture */, s.color);

                                  true /* disableTexture */, color);

        engine.drawMesh(mesh);

        engine.disableBlending();

    }