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

Commit 5ef5500b authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Clean up RenderEngineTest 

Split out from Ib9b8abb25f4894f1b50b6286720c2abf89ca74e2, since they're
orthogonal.

Remove `skip()`, which I believe stopped being called in
I69119623b194885bcc4cf2ddc8e592576b713b19.

Remove SkiaGLESCMRenderEngineFactory, which hasn't been used since
I761cbd3967d1800cc74538f93f1b9c3ffe11ee6a.

Consolidate createRenderEngine (and the trivial
createSkiaVkRenderEngine) into the base class, since all versions were
doing essentially the same thing.

Bug: NA
Test: atest librenderengine_test
Change-Id: Iad446bfa39e371f34db76e2aecfd1fbfb706fc02
parent 9e14fec2

libs/renderengine/tests/RenderEngineTest.cpp

+9 −56
Original line number Diff line number Diff line
@@ -107,24 +107,8 @@ public: 


    virtual std::string name() = 0;

    virtual renderengine::RenderEngine::RenderEngineType type() = 0;

    virtual std::unique_ptr<renderengine::RenderEngine> createRenderEngine() = 0;

    virtual bool typeSupported() = 0;

};



class SkiaVkRenderEngineFactory : public RenderEngineFactory {

public:

    std::string name() override { return "SkiaVkRenderEngineFactory"; }



    renderengine::RenderEngine::RenderEngineType type() {

        return renderengine::RenderEngine::RenderEngineType::SKIA_VK;

    }



    std::unique_ptr<renderengine::RenderEngine> createRenderEngine() override {

        std::unique_ptr<renderengine::RenderEngine> re = createSkiaVkRenderEngine();

        return re;

    }



    std::unique_ptr<renderengine::skia::SkiaVkRenderEngine> createSkiaVkRenderEngine() {

    std::unique_ptr<renderengine::RenderEngine> createRenderEngine() {

        renderengine::RenderEngineCreationArgs reCreationArgs =

                renderengine::RenderEngineCreationArgs::Builder()

                        .setPixelFormat(static_cast<int>(ui::PixelFormat::RGBA_8888))
@@ -135,62 +119,31 @@ public: 
                        .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)

                        .setRenderEngineType(type())

                        .build();

        return renderengine::skia::SkiaVkRenderEngine::create(reCreationArgs);

        return renderengine::RenderEngine::create(reCreationArgs);

    }



    bool typeSupported() override {

        return skia::SkiaVkRenderEngine::canSupportSkiaVkRenderEngine();

    }

    void skip() { GTEST_SKIP(); }

};



class SkiaGLESRenderEngineFactory : public RenderEngineFactory {

class SkiaVkRenderEngineFactory : public RenderEngineFactory {

public:

    std::string name() override { return "SkiaGLRenderEngineFactory"; }

    std::string name() override { return "SkiaVkRenderEngineFactory"; }



    renderengine::RenderEngine::RenderEngineType type() {

        return renderengine::RenderEngine::RenderEngineType::SKIA_GL;

        return renderengine::RenderEngine::RenderEngineType::SKIA_VK;

    }



    std::unique_ptr<renderengine::RenderEngine> createRenderEngine() override {

        renderengine::RenderEngineCreationArgs reCreationArgs =

                renderengine::RenderEngineCreationArgs::Builder()

                        .setPixelFormat(static_cast<int>(ui::PixelFormat::RGBA_8888))

                        .setImageCacheSize(1)

                        .setEnableProtectedContext(false)

                        .setPrecacheToneMapperShaderOnly(false)

                        .setSupportsBackgroundBlur(true)

                        .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)

                        .setRenderEngineType(type())

                        .build();

        return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);

    bool typeSupported() override {

        return skia::SkiaVkRenderEngine::canSupportSkiaVkRenderEngine();

    }



    bool typeSupported() override { return true; }

};



class SkiaGLESCMRenderEngineFactory : public RenderEngineFactory {

class SkiaGLESRenderEngineFactory : public RenderEngineFactory {

public:

    std::string name() override { return "SkiaGLCMRenderEngineFactory"; }

    std::string name() override { return "SkiaGLRenderEngineFactory"; }



    renderengine::RenderEngine::RenderEngineType type() {

        return renderengine::RenderEngine::RenderEngineType::SKIA_GL;

    }



    std::unique_ptr<renderengine::RenderEngine> createRenderEngine() override {

        renderengine::RenderEngineCreationArgs reCreationArgs =

                renderengine::RenderEngineCreationArgs::Builder()

                        .setPixelFormat(static_cast<int>(ui::PixelFormat::RGBA_8888))

                        .setImageCacheSize(1)

                        .setEnableProtectedContext(false)

                        .setPrecacheToneMapperShaderOnly(false)

                        .setSupportsBackgroundBlur(true)

                        .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)

                        .setRenderEngineType(type())

                        .build();

        return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);

    }



    bool typeSupported() override { return true; }

};