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

Commit d56c39ab authored by Chia-I Wu's avatar Chia-I Wu
Browse files

resolve merge conflicts of 5e9a43e0 to master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifee65e8d29f4502f0e73b8653c6e672cd14d9712
parents 4ea6cc9d 5e9a43e0

services/surfaceflinger/SurfaceFlinger.cpp

+44 −56
Original line number Diff line number Diff line
@@ -3049,8 +3049,6 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 


    ALOGV("Rendering client layers");

    const Transform& displayTransform = displayDevice->getTransform();

    if (hwcId >= 0) {

        // we're using h/w composer

    bool firstLayer = true;

    for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) {

        const Region clip(bounds.intersect(
@@ -3101,16 +3099,6 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 
        }

        firstLayer = false;

    }

    } else {

        // we're not using h/w composer

        for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) {

            const Region clip(bounds.intersect(

                    displayTransform.transform(layer->visibleRegion)));

            if (!clip.isEmpty()) {

                layer->draw(renderArea, clip);

            }

        }

    }



    if (applyColorMatrix) {

        getRenderEngine().setupColorTransform(oldColorMatrix);