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

Commit 454dc23e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Dump CompositionEngine layers and cleanup output"

parents e1516381 207def90

services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ namespace android::compositionengine::impl { 
using android::base::StringAppendF;

using android::base::StringAppendF;





void dumpVal(std::string& out, const char* name, bool value) {

void dumpVal(std::string& out, const char* name, bool value) {

    StringAppendF(&out, "%s=%c ", name, value ? 'T' : 'F');

    StringAppendF(&out, "%s=%s ", name, value ? "true" : "false");

}

}





void dumpVal(std::string& out, const char* name, const void* value) {

void dumpVal(std::string& out, const char* name, const void* value) {

services/surfaceflinger/CompositionEngine/src/Layer.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,9 @@ LayerCompositionState& Layer::editState() { 
}

}





void Layer::dump(std::string& out) const {

void Layer::dump(std::string& out) const {

    android::base::StringAppendF(&out, "     Layer %p\n", this);

    auto layerFE = getLayerFE();

    android::base::StringAppendF(&out, "* compositionengine::Layer %p (%s)\n", this,

                                 layerFE ? layerFE->getDebugName() : "<unknown>");

    mState.dump(out);

    mState.dump(out);

}

}

services/surfaceflinger/CompositionEngine/src/Output.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ void Output::dumpBase(std::string& out) const { 
        out.append("    No render surface!\n");

        out.append("    No render surface!\n");

    }

    }





    out.append("\n   %d Layers", mOutputLayersOrderedByZ.size());

    android::base::StringAppendF(&out, "\n   %zu Layers\b", mOutputLayersOrderedByZ.size());

    for (const auto& outputLayer : mOutputLayersOrderedByZ) {

    for (const auto& outputLayer : mOutputLayersOrderedByZ) {

        if (!outputLayer) {

        if (!outputLayer) {

            continue;

            continue;

services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
namespace android::compositionengine::impl {

namespace android::compositionengine::impl {





void OutputCompositionState::dump(std::string& out) const {

void OutputCompositionState::dump(std::string& out) const {

    out.append("   ");

    dumpVal(out, "isEnabled", isEnabled);

    dumpVal(out, "isEnabled", isEnabled);

    dumpVal(out, "isSecure", isSecure);

    dumpVal(out, "isSecure", isSecure);

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -379,7 +379,8 @@ void OutputLayer::writeStateToHWC(bool includeGeometry) const { 
void OutputLayer::dump(std::string& out) const {

void OutputLayer::dump(std::string& out) const {

    using android::base::StringAppendF;

    using android::base::StringAppendF;





    StringAppendF(&out, "     Output Layer %p\n", this);

    StringAppendF(&out, "  - Output Layer %p (Composition layer %p) (%s)\n", this, mLayer.get(),

                  mLayerFE->getDebugName());

    mState.dump(out);

    mState.dump(out);

}

}