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

Commit 1d12b3b8 authored by Ana Krulec's avatar Ana Krulec Committed by Alec Mouri
Browse files

Adding SkiaGL RE information to dumpsys 

Test: adb shell dumpsys SurfaceFlinger
Bug: 178539829
Change-Id: I46f016c055d73d073468785b1e67d848fd1b81ac
Merged-In: I46f016c055d73d073468785b1e67d848fd1b81ac
(cherry picked from commit b483d527)
parent dd5bfa93

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+51 −0
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ 
#include <SkRegion.h>

#include <SkShadowUtils.h>

#include <SkSurface.h>

#include <android-base/stringprintf.h>

#include <gl/GrGLInterface.h>

#include <sync/sync.h>

#include <ui/BlurRegion.h>

#include <ui/DebugUtils.h>

#include <ui/GraphicBuffer.h>

#include <utils/Trace.h>
@@ -59,6 +61,8 @@ namespace android { 
namespace renderengine {

namespace skia {



using base::StringAppendF;



static status_t selectConfigForAttribute(EGLDisplay dpy, EGLint const* attrs, EGLint attribute,

                                         EGLint wanted, EGLConfig* outConfig) {

    EGLint numConfigs = -1, n = 0;
@@ -1075,6 +1079,53 @@ int SkiaGLRenderEngine::getContextPriority() { 
    return value;

}



void SkiaGLRenderEngine::dump(std::string& result) {

    const gl::GLExtensions& extensions = gl::GLExtensions::getInstance();



    StringAppendF(&result, "\n ------------RE-----------------\n");

    StringAppendF(&result, "EGL implementation : %s\n", extensions.getEGLVersion());

    StringAppendF(&result, "%s\n", extensions.getEGLExtensions());

    StringAppendF(&result, "GLES: %s, %s, %s\n", extensions.getVendor(), extensions.getRenderer(),

                  extensions.getVersion());

    StringAppendF(&result, "%s\n", extensions.getExtensions());

    StringAppendF(&result, "RenderEngine supports protected context: %d\n",

                  supportsProtectedContent());

    StringAppendF(&result, "RenderEngine is in protected context: %d\n", mInProtectedContext);



    {

        std::lock_guard<std::mutex> lock(mRenderingMutex);

        StringAppendF(&result, "RenderEngine texture cache size: %zu\n", mTextureCache.size());

        StringAppendF(&result, "Dumping buffer ids...\n");

        // TODO(178539829): It would be nice to know which layer these are coming from and what

        // the texture sizes are.

        for (const auto& [id, unused] : mTextureCache) {

            StringAppendF(&result, "- 0x%" PRIx64 "\n", id);

        }

        StringAppendF(&result, "\n");

        StringAppendF(&result, "RenderEngine protected texture cache size: %zu\n",

                      mProtectedTextureCache.size());

        StringAppendF(&result, "Dumping buffer ids...\n");

        for (const auto& [id, unused] : mProtectedTextureCache) {

            StringAppendF(&result, "- 0x%" PRIx64 "\n", id);

        }

        StringAppendF(&result, "\n");

        StringAppendF(&result, "RenderEngine runtime effects: %zu\n", mRuntimeEffects.size());

        for (const auto& [linearEffect, unused] : mRuntimeEffects) {

            StringAppendF(&result, "- inputDataspace: %s\n",

                          dataspaceDetails(

                                  static_cast<android_dataspace>(linearEffect.inputDataspace))

                                  .c_str());

            StringAppendF(&result, "- outputDataspace: %s\n",

                          dataspaceDetails(

                                  static_cast<android_dataspace>(linearEffect.outputDataspace))

                                  .c_str());

            StringAppendF(&result, "undoPremultipliedAlpha: %s\n",

                          linearEffect.undoPremultipliedAlpha ? "true" : "false");

        }

    }

    StringAppendF(&result, "\n");

}



} // namespace skia

} // namespace renderengine

} // namespace android

libs/renderengine/skia/SkiaGLRenderEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
    bool useProtectedContext(bool useProtectedContext) override;



protected:

    void dump(std::string& /*result*/) override{};

    void dump(std::string& result) override;

    size_t getMaxTextureSize() const override;

    size_t getMaxViewportDims() const override;