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

Commit 18f442eb authored by John Reck's avatar John Reck
Browse files

Remove RenderPipelineType::OpenGL (1/many) 

Just removes the define & all things referencing the define.

Test: hwui_unit passes
Change-Id: I3f98c271e23ef696c40addf260abdc0fb149a70d
parent 076b631d

libs/hwui/Android.bp

+0 −14
Original line number Original line Diff line number Diff line
@@ -345,33 +345,21 @@ cc_test { 




    srcs: [

    srcs: [

        "tests/unit/main.cpp",

        "tests/unit/main.cpp",

        "tests/unit/BakedOpDispatcherTests.cpp",

        "tests/unit/BakedOpRendererTests.cpp",

        "tests/unit/BakedOpStateTests.cpp",

        "tests/unit/CacheManagerTests.cpp",

        "tests/unit/CacheManagerTests.cpp",

        "tests/unit/CanvasContextTests.cpp",

        "tests/unit/CanvasContextTests.cpp",

        "tests/unit/CanvasStateTests.cpp",

        "tests/unit/CanvasStateTests.cpp",

        "tests/unit/ClipAreaTests.cpp",

        "tests/unit/ClipAreaTests.cpp",

        "tests/unit/DamageAccumulatorTests.cpp",

        "tests/unit/DamageAccumulatorTests.cpp",

        "tests/unit/DeferredLayerUpdaterTests.cpp",

        "tests/unit/DeferredLayerUpdaterTests.cpp",

        "tests/unit/DeviceInfoTests.cpp",

        "tests/unit/FatVectorTests.cpp",

        "tests/unit/FatVectorTests.cpp",

        "tests/unit/FontRendererTests.cpp",

        "tests/unit/FrameBuilderTests.cpp",

        "tests/unit/GlopBuilderTests.cpp",

        "tests/unit/GpuMemoryTrackerTests.cpp",

        "tests/unit/GpuMemoryTrackerTests.cpp",

        "tests/unit/GradientCacheTests.cpp",

        "tests/unit/GraphicsStatsServiceTests.cpp",

        "tests/unit/GraphicsStatsServiceTests.cpp",

        "tests/unit/LayerUpdateQueueTests.cpp",

        "tests/unit/LayerUpdateQueueTests.cpp",

        "tests/unit/LeakCheckTests.cpp",

        "tests/unit/LinearAllocatorTests.cpp",

        "tests/unit/LinearAllocatorTests.cpp",

        "tests/unit/MatrixTests.cpp",

        "tests/unit/MatrixTests.cpp",

        "tests/unit/MeshStateTests.cpp",

        "tests/unit/OffscreenBufferPoolTests.cpp",

        "tests/unit/OpDumperTests.cpp",

        "tests/unit/OpDumperTests.cpp",

        "tests/unit/PathInterpolatorTests.cpp",

        "tests/unit/PathInterpolatorTests.cpp",

        "tests/unit/RenderNodeDrawableTests.cpp",

        "tests/unit/RenderNodeDrawableTests.cpp",

        "tests/unit/RecordingCanvasTests.cpp",

        "tests/unit/RenderNodeTests.cpp",

        "tests/unit/RenderNodeTests.cpp",

        "tests/unit/RenderPropertiesTests.cpp",

        "tests/unit/RenderPropertiesTests.cpp",

        "tests/unit/ShaderCacheTests.cpp",

        "tests/unit/ShaderCacheTests.cpp",
@@ -383,8 +371,6 @@ cc_test { 
        "tests/unit/SnapshotTests.cpp",

        "tests/unit/SnapshotTests.cpp",

        "tests/unit/StringUtilsTests.cpp",

        "tests/unit/StringUtilsTests.cpp",

        "tests/unit/TestUtilsTests.cpp",

        "tests/unit/TestUtilsTests.cpp",

        "tests/unit/TextDropShadowCacheTests.cpp",

        "tests/unit/TextureCacheTests.cpp",

        "tests/unit/ThreadBaseTests.cpp",

        "tests/unit/ThreadBaseTests.cpp",

        "tests/unit/TypefaceTests.cpp",

        "tests/unit/TypefaceTests.cpp",

        "tests/unit/VectorDrawableTests.cpp",

        "tests/unit/VectorDrawableTests.cpp",

libs/hwui/Properties.cpp

+4 −7
Original line number Original line Diff line number Diff line
@@ -193,15 +193,12 @@ RenderPipelineType Properties::getRenderPipelineType() { 
    }

    }

    char prop[PROPERTY_VALUE_MAX];

    char prop[PROPERTY_VALUE_MAX];

    property_get(PROPERTY_RENDERER, prop, "skiagl");

    property_get(PROPERTY_RENDERER, prop, "skiagl");

    if (!strcmp(prop, "skiagl")) {

    if (!strcmp(prop, "skiavk")) {

        ALOGD("Skia GL Pipeline");

        sRenderPipelineType = RenderPipelineType::SkiaGL;

    } else if (!strcmp(prop, "skiavk")) {

        ALOGD("Skia Vulkan Pipeline");

        ALOGD("Skia Vulkan Pipeline");

        sRenderPipelineType = RenderPipelineType::SkiaVulkan;

        sRenderPipelineType = RenderPipelineType::SkiaVulkan;

    } else {  //"opengl"

    } else {  //"skiagl"

        ALOGD("HWUI GL Pipeline");

        ALOGD("Skia GL Pipeline");

        sRenderPipelineType = RenderPipelineType::OpenGL;

        sRenderPipelineType = RenderPipelineType::SkiaGL;

    }

    }

    return sRenderPipelineType;

    return sRenderPipelineType;

}

}

libs/hwui/Properties.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ enum class OverdrawColorSet { Default = 0, Deuteranomaly }; 




enum class StencilClipDebug { Hide, ShowHighlight, ShowRegion };

enum class StencilClipDebug { Hide, ShowHighlight, ShowRegion };





enum class RenderPipelineType { OpenGL = 0, SkiaGL, SkiaVulkan, NotInitialized = 128 };

enum class RenderPipelineType { SkiaGL, SkiaVulkan, NotInitialized = 128 };





/**

/**

 * Renderthread-only singleton which manages several static rendering properties. Most of these

 * Renderthread-only singleton which manages several static rendering properties. Most of these

libs/hwui/renderthread/CanvasContext.cpp

+11 −63
Original line number Original line Diff line number Diff line
@@ -69,9 +69,6 @@ CanvasContext* CanvasContext::create(RenderThread& thread, bool translucent, 
    auto renderType = Properties::getRenderPipelineType();

    auto renderType = Properties::getRenderPipelineType();





    switch (renderType) {

    switch (renderType) {

        case RenderPipelineType::OpenGL:

            return new CanvasContext(thread, translucent, rootRenderNode, contextFactory,

                                     std::make_unique<OpenGLPipeline>(thread));

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaGL:

            return new CanvasContext(thread, translucent, rootRenderNode, contextFactory,

            return new CanvasContext(thread, translucent, rootRenderNode, contextFactory,

                                     std::make_unique<skiapipeline::SkiaOpenGLPipeline>(thread));

                                     std::make_unique<skiapipeline::SkiaOpenGLPipeline>(thread));
@@ -86,28 +83,13 @@ CanvasContext* CanvasContext::create(RenderThread& thread, bool translucent, 
}

}





void CanvasContext::destroyLayer(RenderNode* node) {

void CanvasContext::destroyLayer(RenderNode* node) {

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

        case RenderPipelineType::OpenGL:

            OpenGLPipeline::destroyLayer(node);

            break;

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaVulkan:

    skiapipeline::SkiaPipeline::destroyLayer(node);

    skiapipeline::SkiaPipeline::destroyLayer(node);

            break;

        default:

            LOG_ALWAYS_FATAL("canvas context type %d not supported", (int32_t)renderType);

            break;

    }

}

}





void CanvasContext::invokeFunctor(const RenderThread& thread, Functor* functor) {

void CanvasContext::invokeFunctor(const RenderThread& thread, Functor* functor) {

    ATRACE_CALL();

    ATRACE_CALL();

    auto renderType = Properties::getRenderPipelineType();

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

    switch (renderType) {

        case RenderPipelineType::OpenGL:

            OpenGLPipeline::invokeFunctor(thread, functor);

            break;

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaGL:

            skiapipeline::SkiaOpenGLPipeline::invokeFunctor(thread, functor);

            skiapipeline::SkiaOpenGLPipeline::invokeFunctor(thread, functor);

            break;

            break;
@@ -121,19 +103,7 @@ void CanvasContext::invokeFunctor(const RenderThread& thread, Functor* functor) 
}

}





void CanvasContext::prepareToDraw(const RenderThread& thread, Bitmap* bitmap) {

void CanvasContext::prepareToDraw(const RenderThread& thread, Bitmap* bitmap) {

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

        case RenderPipelineType::OpenGL:

            OpenGLPipeline::prepareToDraw(thread, bitmap);

            break;

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaVulkan:

    skiapipeline::SkiaPipeline::prepareToDraw(thread, bitmap);

    skiapipeline::SkiaPipeline::prepareToDraw(thread, bitmap);

            break;

        default:

            LOG_ALWAYS_FATAL("canvas context type %d not supported", (int32_t)renderType);

            break;

    }

}

}





CanvasContext::CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,

CanvasContext::CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,
@@ -586,23 +556,7 @@ void CanvasContext::destroyHardwareResources() { 
}

}





void CanvasContext::trimMemory(RenderThread& thread, int level) {

void CanvasContext::trimMemory(RenderThread& thread, int level) {

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

        case RenderPipelineType::OpenGL: {

            // No context means nothing to free

            if (!thread.eglManager().hasEglContext()) return;

    ATRACE_CALL();

    ATRACE_CALL();

            if (level >= TRIM_MEMORY_COMPLETE) {

                thread.renderState().flush(Caches::FlushMode::Full);

                thread.eglManager().destroy();

            } else if (level >= TRIM_MEMORY_UI_HIDDEN) {

                thread.renderState().flush(Caches::FlushMode::Moderate);

            }

            break;

        }

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaVulkan: {

            // No context means nothing to free

    if (!thread.getGrContext()) return;

    if (!thread.getGrContext()) return;

    ATRACE_CALL();

    ATRACE_CALL();

    if (level >= TRIM_MEMORY_COMPLETE) {

    if (level >= TRIM_MEMORY_COMPLETE) {
@@ -612,12 +566,6 @@ void CanvasContext::trimMemory(RenderThread& thread, int level) { 
    } else if (level >= TRIM_MEMORY_UI_HIDDEN) {

    } else if (level >= TRIM_MEMORY_UI_HIDDEN) {

        thread.cacheManager().trimMemory(CacheManager::TrimMemoryMode::UiHidden);

        thread.cacheManager().trimMemory(CacheManager::TrimMemoryMode::UiHidden);

    }

    }

            break;

        }

        default:

            LOG_ALWAYS_FATAL("canvas context type %d not supported", (int32_t)renderType);

            break;

    }

}

}





DeferredLayerUpdater* CanvasContext::createTextureLayer() {

DeferredLayerUpdater* CanvasContext::createTextureLayer() {

libs/hwui/renderthread/RenderThread.cpp

+0 −15
Original line number Original line Diff line number Diff line
@@ -175,16 +175,6 @@ void RenderThread::dumpGraphicsMemory(int fd) { 
    String8 pipeline;

    String8 pipeline;

    auto renderType = Properties::getRenderPipelineType();

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

    switch (renderType) {

        case RenderPipelineType::OpenGL: {

            if (Caches::hasInstance()) {

                cachesOutput.appendFormat("Caches:\n");

                Caches::getInstance().dumpMemoryUsage(cachesOutput);

            } else {

                cachesOutput.appendFormat("No caches instance.");

            }

            pipeline.appendFormat("FrameBuilder");

            break;

        }

        case RenderPipelineType::SkiaGL: {

        case RenderPipelineType::SkiaGL: {

            mCacheManager->dumpMemoryUsage(cachesOutput, mRenderState);

            mCacheManager->dumpMemoryUsage(cachesOutput, mRenderState);

            pipeline.appendFormat("Skia (OpenGL)");

            pipeline.appendFormat("Skia (OpenGL)");
@@ -208,9 +198,6 @@ Readback& RenderThread::readback() { 
    if (!mReadback) {

    if (!mReadback) {

        auto renderType = Properties::getRenderPipelineType();

        auto renderType = Properties::getRenderPipelineType();

        switch (renderType) {

        switch (renderType) {

            case RenderPipelineType::OpenGL:

                mReadback = new OpenGLReadbackImpl(*this);

                break;

            case RenderPipelineType::SkiaGL:

            case RenderPipelineType::SkiaGL:

                mReadback = new skiapipeline::SkiaOpenGLReadback(*this);

                mReadback = new skiapipeline::SkiaOpenGLReadback(*this);

                break;

                break;
@@ -344,8 +331,6 @@ void RenderThread::pushBackFrameCallback(IFrameCallback* callback) { 
sk_sp<Bitmap> RenderThread::allocateHardwareBitmap(SkBitmap& skBitmap) {

sk_sp<Bitmap> RenderThread::allocateHardwareBitmap(SkBitmap& skBitmap) {

    auto renderType = Properties::getRenderPipelineType();

    auto renderType = Properties::getRenderPipelineType();

    switch (renderType) {

    switch (renderType) {

        case RenderPipelineType::OpenGL:

            return OpenGLPipeline::allocateHardwareBitmap(*this, skBitmap);

        case RenderPipelineType::SkiaGL:

        case RenderPipelineType::SkiaGL:

            return skiapipeline::SkiaOpenGLPipeline::allocateHardwareBitmap(*this, skBitmap);

            return skiapipeline::SkiaOpenGLPipeline::allocateHardwareBitmap(*this, skBitmap);

        case RenderPipelineType::SkiaVulkan:

        case RenderPipelineType::SkiaVulkan: