diff options
| -rw-r--r-- | libs/renderengine/tests/RenderEngineTest.cpp | 65 |
1 files changed, 9 insertions, 56 deletions
diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp index 11d4fdebdc..2fd2a35927 100644 --- a/libs/renderengine/tests/RenderEngineTest.cpp +++ b/libs/renderengine/tests/RenderEngineTest.cpp @@ -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; } }; |