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

Commit 07d60ff5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Note Ganesh vs. Graphite in RenderEngine's dumpsys section" into main

parents 525e783f a4814649

libs/renderengine/skia/GaneshVkRenderEngine.cpp

+8 −0
Original line number Diff line number Diff line
@@ -21,12 +21,15 @@ 


#include <include/gpu/ganesh/vk/GrVkBackendSemaphore.h>



#include <android-base/stringprintf.h>

#include <common/trace.h>

#include <log/log_main.h>

#include <sync/sync.h>



namespace android::renderengine::skia {



using base::StringAppendF;



std::unique_ptr<GaneshVkRenderEngine> GaneshVkRenderEngine::create(

        const RenderEngineCreationArgs& args) {

    std::unique_ptr<GaneshVkRenderEngine> engine(new GaneshVkRenderEngine(args));
@@ -111,4 +114,9 @@ base::unique_fd GaneshVkRenderEngine::flushAndSubmit(SkiaGpuContext* context, 
    return res;

}



void GaneshVkRenderEngine::appendBackendSpecificInfoToDump(std::string& result) {

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

    SkiaVkRenderEngine::appendBackendSpecificInfoToDump(result);

}



} // namespace android::renderengine::skia

libs/renderengine/skia/GaneshVkRenderEngine.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ protected: 
    std::unique_ptr<SkiaGpuContext> createContext(VulkanInterface& vulkanInterface) override;

    void waitFence(SkiaGpuContext* context, base::borrowed_fd fenceFd) override;

    base::unique_fd flushAndSubmit(SkiaGpuContext* context, sk_sp<SkSurface> dstSurface) override;

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



private:

    GaneshVkRenderEngine(const RenderEngineCreationArgs& args) : SkiaVkRenderEngine(args) {}

libs/renderengine/skia/GraphiteVkRenderEngine.cpp

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <include/gpu/graphite/Recording.h>

#include <include/gpu/graphite/vk/VulkanGraphiteTypes.h>



#include <android-base/stringprintf.h>

#include <log/log_main.h>

#include <sync/sync.h>
@@ -33,6 +34,8 @@ 


namespace android::renderengine::skia {



using base::StringAppendF;



std::unique_ptr<GraphiteVkRenderEngine> GraphiteVkRenderEngine::create(

        const RenderEngineCreationArgs& args) {

    std::unique_ptr<GraphiteVkRenderEngine> engine(new GraphiteVkRenderEngine(args));
@@ -139,4 +142,9 @@ base::unique_fd GraphiteVkRenderEngine::flushAndSubmit(SkiaGpuContext* context, 
    return drawFenceFd;

}



void GraphiteVkRenderEngine::appendBackendSpecificInfoToDump(std::string& result) {

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

    SkiaVkRenderEngine::appendBackendSpecificInfoToDump(result);

}



} // namespace android::renderengine::skia

libs/renderengine/skia/GraphiteVkRenderEngine.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ protected: 
    std::unique_ptr<SkiaGpuContext> createContext(VulkanInterface& vulkanInterface) override;

    void waitFence(SkiaGpuContext* context, base::borrowed_fd fenceFd) override;

    base::unique_fd flushAndSubmit(SkiaGpuContext* context, sk_sp<SkSurface> dstSurface) override;

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



private:

    GraphiteVkRenderEngine(const RenderEngineCreationArgs& args) : SkiaVkRenderEngine(args) {}

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ int SkiaGLRenderEngine::getContextPriority() { 


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

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

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

    StringAppendF(&result, "\n ------------RE GLES (Ganesh)------------\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(),