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

Commit fb9dfe7b authored by Alec Mouri's avatar Alec Mouri
Browse files

Revert^2 "Add initial support for display readback" 

This reverts commit 2adde97b.

Reason for revert: I53b40a857152d864e4f28abecfc8e7745156857c has a fix

Bug: 384816457
Change-Id: I64d2c7baa4bb3473e032f9f367ffa1efc034c6a4
parent 2cee2ea7

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ 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 {
@@ -239,6 +240,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 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

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


    PictureProfileHandle pictureProfileHandle;



    sp<GraphicBuffer> readbackBuffer = nullptr;



    // Debugging

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

};

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 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

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#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
@@ -266,6 +267,12 @@ 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,