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

Commit c7e17a2e authored by Lloyd Pique's avatar Lloyd Pique
Browse files

SF: Remove unused SurfaceFlinger::getLayerSortedByZForHwcDisplay 

There were no callers, and it relied on CompositionEngine state being
made internal to the new code.

Test: atest libsurfaceflinger_unittest libcompositionengine_test
Bug: 121291683
Change-Id: I896ccc65c13acf3d9ea87c65da388b06f35ac175
parent 35fca9d4

services/surfaceflinger/SurfaceFlinger.cpp

+0 −13
Original line number Original line Diff line number Diff line
@@ -4972,19 +4972,6 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co 
    result.append("\n");

    result.append("\n");

}

}





const Vector<sp<Layer>>& SurfaceFlinger::getLayerSortedByZForHwcDisplay(DisplayId displayId) {

    // Note: mStateLock is held here

    for (const auto& [token, display] : mDisplays) {

        if (display->getId() == displayId) {

            return getDisplayDeviceLocked(token)->getVisibleLayersSortedByZ();

        }

    }



    ALOGE("%s: Invalid display %s", __FUNCTION__, to_string(displayId).c_str());

    static const Vector<sp<Layer>> empty;

    return empty;

}



void SurfaceFlinger::updateColorMatrixLocked() {

void SurfaceFlinger::updateColorMatrixLocked() {

    mat4 colorMatrix;

    mat4 colorMatrix;

    if (mGlobalSaturationFactor != 1.0f) {

    if (mGlobalSaturationFactor != 1.0f) {

services/surfaceflinger/SurfaceFlinger.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -304,10 +304,6 @@ public: 
    // TODO: this should be made accessible only to MessageQueue

    // TODO: this should be made accessible only to MessageQueue

    void onMessageReceived(int32_t what);

    void onMessageReceived(int32_t what);





    // for debugging only

    // TODO: this should be made accessible only to HWComposer

    const Vector<sp<Layer>>& getLayerSortedByZForHwcDisplay(DisplayId displayId);



    renderengine::RenderEngine& getRenderEngine() const;

    renderengine::RenderEngine& getRenderEngine() const;





    bool authenticateSurfaceTextureLocked(

    bool authenticateSurfaceTextureLocked(