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

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

Merge "surfaceflinger: minor dumpsys improvements" into pi-dev

parents 92f8d8b1 1e04361d

services/surfaceflinger/DisplayDevice.cpp

+5 −1
Original line number Diff line number Diff line
@@ -453,7 +453,11 @@ void DisplayDevice::dump(String8& result) const { 
                        tr[0][1], tr[1][1], tr[2][1], tr[0][2], tr[1][2], tr[2][2]);

    auto const surface = static_cast<Surface*>(window);

    android_dataspace dataspace = surface->getBuffersDataSpace();

    result.appendFormat("   dataspace: %s (%d)\n", dataspaceDetails(dataspace).c_str(), dataspace);

    result.appendFormat("   wideColor=%d, hdr=%d, colorMode=%s, dataspace: %s (%d)\n",

                        mDisplayHasWideColor, mDisplayHasHdr,

                        decodeColorMode(mActiveColorMode).c_str(),

                        dataspaceDetails(dataspace).c_str(), dataspace);





    String8 surfaceDump;

    mDisplaySurface->dumpAsString(surfaceDump);

services/surfaceflinger/Layer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,11 @@ void Layer::miniDump(String8& result, int32_t hwcId) const { 


    const Layer::State& layerState(getDrawingState());

    const LayerBE::HWCInfo& hwcInfo = getBE().mHwcLayers.at(hwcId);

    if (layerState.zOrderRelativeOf != nullptr || mDrawingParent != nullptr) {

        result.appendFormat("  rel %6d | ", layerState.z);

    } else {

        result.appendFormat("  %10d | ", layerState.z);

    }

    result.appendFormat("%10s | ", to_string(getCompositionType(hwcId)).c_str());

    const Rect& frame = hwcInfo.displayFrame;

    result.appendFormat("%4d %4d %4d %4d | ", frame.left, frame.top, frame.right, frame.bottom);

services/surfaceflinger/RenderEngine/Surface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void Surface::swapBuffers() const { 


EGLint Surface::queryConfig(EGLint attrib) const {

    EGLint value;

    if (!eglGetConfigAttrib(mEGLConfig, mEGLConfig, attrib, &value)) {

    if (!eglGetConfigAttrib(mEGLDisplay, mEGLConfig, attrib, &value)) {

        value = 0;

    }

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -4049,6 +4049,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, 
    LayersProto layersProto = dumpProtoInfo(LayerVector::StateSet::Current);

    auto layerTree = LayerProtoParser::generateLayerTree(layersProto);

    result.append(LayerProtoParser::layersToString(std::move(layerTree)).c_str());

    result.append("\n");



    /*

     * Dump Display state
@@ -4061,6 +4062,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, 
        const sp<const DisplayDevice>& hw(mDisplays[dpy]);

        hw->dump(result);

    }

    result.append("\n");



    /*

     * Dump SurfaceFlinger global state

services/surfaceflinger/layerproto/LayerProtoParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ std::string LayerProtoParser::Layer::to_string() const { 
                  finalCrop.to_string().c_str());

    StringAppendF(&result, "isOpaque=%1d, invalidate=%1d, ", isOpaque, invalidate);

    StringAppendF(&result, "dataspace=%s, ", dataspace.c_str());

    StringAppendF(&result, "pixelformat=%s, ", pixelFormat.c_str());

    StringAppendF(&result, "defaultPixelFormat=%s, ", pixelFormat.c_str());

    StringAppendF(&result, "color=(%.3f,%.3f,%.3f,%.3f), flags=0x%08x, ",

                  static_cast<double>(color.r), static_cast<double>(color.g),

                  static_cast<double>(color.b), static_cast<double>(color.a), flags);

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+2 −2

File changed.

Contains only whitespace changes.