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

Commit 2adde97b authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Add initial support for display readback" 

This reverts commit bf769e4b.

Reason for revert: Droidmonitor created revert due to b/420737122. Will be verifying through ABTD before submission.

Bug: 384816457
Fix: 420737122
Change-Id: Ie7973b4b4d09a3b6821f17411be2bae024217ad5
parent bf769e4b

services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h

+0 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ public: 
        sp<Fence> presentFence{Fence::NO_FENCE};

        sp<Fence> clientTargetAcquireFence{Fence::NO_FENCE};

        std::unordered_map<HWC2::Layer*, sp<Fence>> layerFences;

        sp<Fence> readbackFence{Fence::NO_FENCE};

    };



    struct ColorProfile {
@@ -240,7 +239,6 @@ public: 
    // See Output::setLayerFilter.

    virtual bool includesLayer(ui::LayerFilter) const = 0;

    virtual bool includesLayer(const sp<LayerFE>&) const = 0;

    virtual bool includesLayer(LayerFE*) const = 0;



    // Returns a pointer to the output layer corresponding to the given layer on

    // this output, or nullptr if the layer does not have one

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ public: 


    bool includesLayer(ui::LayerFilter) const override;

    bool includesLayer(const sp<LayerFE>&) const override;

    bool includesLayer(LayerFE*) const override;



    compositionengine::OutputLayer* getOutputLayerForLayer(const sp<LayerFE>&) const override;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+0 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ struct OutputCompositionState { 


    PictureProfileHandle pictureProfileHandle;



    sp<GraphicBuffer> readbackBuffer = nullptr;



    // Debugging

    void dump(std::string& result) const;

};

services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Output.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ public: 
    MOCK_METHOD(void, setLayerFilter, (ui::LayerFilter));

    MOCK_METHOD(bool, includesLayer, (ui::LayerFilter), (const));

    MOCK_METHOD(bool, includesLayer, (const sp<compositionengine::LayerFE>&), (const));

    MOCK_METHOD(bool, includesLayer, (compositionengine::LayerFE*), (const));



    MOCK_METHOD1(setColorTransform, void(const compositionengine::CompositionRefreshArgs&));

    MOCK_METHOD1(setColorProfile, void(const ColorProfile&));

services/surfaceflinger/CompositionEngine/src/Display.cpp

+0 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <compositionengine/impl/DumpHelpers.h>

#include <compositionengine/impl/OutputLayer.h>

#include <compositionengine/impl/RenderSurface.h>

#include <ui/DisplayId.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push
@@ -267,12 +266,6 @@ bool Display::chooseCompositionStrategy( 


    const TimePoint hwcValidateStartTime = TimePoint::now();



    const auto physicalDisplayId = getDisplayIdVariant().and_then(asPhysicalDisplayId);



    if (physicalDisplayId && getState().readbackBuffer) {

        hwc.setReadbackBuffer(*physicalDisplayId, getState().readbackBuffer, Fence::NO_FENCE);

    }



    if (status_t result = hwc.getDeviceCompositionChanges(*halDisplayId, requiresClientComposition,

                                                          getState().earliestPresentTime,

                                                          getState().expectedPresentTime,