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

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

Merge "Add dump state information for layer brightness" into tm-dev

parents 195cf243 c6f3101a

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once

#pragma once





#include <cstdint>

#include <cstdint>

#include <optional>

#include <string>

#include <string>

#include <type_traits>

#include <type_traits>
@@ -63,4 +64,13 @@ void dumpVal(std::string& out, const char* name, const ui::Transform&); 
void dumpVal(std::string& out, const char* name, const mat4&);

void dumpVal(std::string& out, const char* name, const mat4&);

void dumpVal(std::string& out, const char* name, const StretchEffect&);

void dumpVal(std::string& out, const char* name, const StretchEffect&);





template <typename T>

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

    if (value.has_value()) {

        return dumpVal(out, name, *value);

    } else {

        return dumpVal(out, name, "nullopt");

    }

}



} // namespace android::compositionengine::impl
 
} // namespace android::compositionengine::impl

services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,10 @@ void OutputCompositionState::dump(std::string& out) const { 
    dumpVal(out, "dataspace", toString(dataspace), dataspace);

    dumpVal(out, "dataspace", toString(dataspace), dataspace);

    dumpVal(out, "colorTransformMatrix", colorTransformMatrix);

    dumpVal(out, "colorTransformMatrix", colorTransformMatrix);

    dumpVal(out, "target dataspace", toString(targetDataspace), targetDataspace);

    dumpVal(out, "target dataspace", toString(targetDataspace), targetDataspace);

    dumpVal(out, "displayBrightnessNits", displayBrightnessNits);

    dumpVal(out, "sdrWhitePointNits", sdrWhitePointNits);

    dumpVal(out, "clientTargetBrightness", clientTargetBrightness);

    dumpVal(out, "displayBrightness", displayBrightness);





    out.append("\n");

    out.append("\n");

}

}

services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,8 @@ void OutputLayerCompositionState::dump(std::string& out) const { 
    dumpVal(out, "sourceCrop", sourceCrop);

    dumpVal(out, "sourceCrop", sourceCrop);

    dumpVal(out, "bufferTransform", toString(bufferTransform), bufferTransform);

    dumpVal(out, "bufferTransform", toString(bufferTransform), bufferTransform);

    dumpVal(out, "dataspace", toString(dataspace), dataspace);

    dumpVal(out, "dataspace", toString(dataspace), dataspace);

    dumpVal(out, "whitePointNits", whitePointNits);

    dumpVal(out, "dimmingRatio", dimmingRatio);

    dumpVal(out, "override buffer", overrideInfo.buffer.get());

    dumpVal(out, "override buffer", overrideInfo.buffer.get());

    dumpVal(out, "override acquire fence", overrideInfo.acquireFence.get());

    dumpVal(out, "override acquire fence", overrideInfo.acquireFence.get());

    dumpVal(out, "override display frame", overrideInfo.displayFrame);

    dumpVal(out, "override display frame", overrideInfo.displayFrame);