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

Commit 0ebaac3f authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Add surface details to dumpsys SurfaceFlinger 

Test: adb shell dumpsys SurfaceFlinger
Bug: 29940137
Change-Id: Ia0216961aa65726fa70ab9b27949344c423ab6fe
parent 72b06f10

services/surfaceflinger/DisplayDevice.cpp

+19 −17
Original line number Diff line number Diff line
@@ -611,23 +611,25 @@ uint32_t DisplayDevice::getPrimaryDisplayOrientationTransform() { 


void DisplayDevice::dump(String8& result) const {

    const Transform& tr(mGlobalTransform);

    result.appendFormat(

        "+ DisplayDevice: %s\n"

        "   type=%x, hwcId=%d, layerStack=%u, (%4dx%4d), ANativeWindow=%p, orient=%2d (type=%08x), "

        "flips=%u, isSecure=%d, powerMode=%d, activeConfig=%d, numLayers=%zu\n"

        "   v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], s:[%d,%d,%d,%d],"

    EGLint redSize, greenSize, blueSize, alphaSize;

    eglGetConfigAttrib(mDisplay, mConfig, EGL_RED_SIZE, &redSize);

    eglGetConfigAttrib(mDisplay, mConfig, EGL_GREEN_SIZE, &greenSize);

    eglGetConfigAttrib(mDisplay, mConfig, EGL_BLUE_SIZE, &blueSize);

    eglGetConfigAttrib(mDisplay, mConfig, EGL_ALPHA_SIZE, &alphaSize);

    result.appendFormat("+ DisplayDevice: %s\n", mDisplayName.string());

    result.appendFormat("   type=%x, hwcId=%d, layerStack=%u, (%4dx%4d), ANativeWindow=%p "

                        "(%d:%d:%d:%d), orient=%2d (type=%08x), "

                        "flips=%u, isSecure=%d, powerMode=%d, activeConfig=%d, numLayers=%zu\n",

                        mType, mHwcDisplayId, mLayerStack, mDisplayWidth, mDisplayHeight,

                        mNativeWindow.get(), redSize, greenSize, blueSize, alphaSize, mOrientation,

                        tr.getType(), getPageFlipCount(), mIsSecure, mPowerMode, mActiveConfig,

                        mVisibleLayersSortedByZ.size());

    result.appendFormat("   v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], s:[%d,%d,%d,%d],"

                        "transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",

        mDisplayName.string(), mType, mHwcDisplayId,

        mLayerStack, mDisplayWidth, mDisplayHeight, mNativeWindow.get(),

        mOrientation, tr.getType(), getPageFlipCount(),

        mIsSecure, mPowerMode, mActiveConfig,

        mVisibleLayersSortedByZ.size(),

                        mViewport.left, mViewport.top, mViewport.right, mViewport.bottom,

        mFrame.left, mFrame.top, mFrame.right, mFrame.bottom,

        mScissor.left, mScissor.top, mScissor.right, mScissor.bottom,

        tr[0][0], tr[1][0], tr[2][0],

        tr[0][1], tr[1][1], tr[2][1],

        tr[0][2], tr[1][2], tr[2][2]);

                        mFrame.left, mFrame.top, mFrame.right, mFrame.bottom, mScissor.left,

                        mScissor.top, mScissor.right, mScissor.bottom, tr[0][0], tr[1][0], tr[2][0],

                        tr[0][1], tr[1][1], tr[2][1], tr[0][2], tr[1][2], tr[2][2]);



    String8 surfaceDump;

    mDisplaySurface->dumpAsString(surfaceDump);

services/surfaceflinger/RenderEngine/RenderEngine.cpp

+7 −3
Original line number Diff line number Diff line
@@ -54,12 +54,16 @@ RenderEngine* RenderEngine::create(EGLDisplay display, int hwcFormat) { 
    // both a 16-bit primary display framebuffer and a 32-bit virtual display

    // framebuffer.

    //

    // EGL_KHR_no_config_context is official extension to allow creating a

    // context that works with any surface of a display.

    //

    // The code assumes that ES2 or later is available if this extension is

    // supported.

    EGLConfig config = EGL_NO_CONFIG;

    if (!findExtension(

            eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS),

            "EGL_ANDROIDX_no_config_context")) {

    if (!findExtension(eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS),

                       "EGL_ANDROIDX_no_config_context") &&

        !findExtension(eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS),

                       "EGL_KHR_no_config_context")) {

        config = chooseEglConfig(display, hwcFormat);

    }