diff options
| -rw-r--r-- | libs/renderengine/Android.bp | 2 | ||||
| -rw-r--r-- | libs/renderengine/RenderEngine.cpp | 8 | ||||
| -rw-r--r-- | libs/renderengine/skia/SkiaVkRenderEngine.cpp | 5 | ||||
| -rw-r--r-- | libs/renderengine/skia/SkiaVkRenderEngine.h | 7 | ||||
| -rw-r--r-- | libs/renderengine/tests/RenderEngineTest.cpp | 9 |
5 files changed, 1 insertions, 30 deletions
diff --git a/libs/renderengine/Android.bp b/libs/renderengine/Android.bp index b8fd1b2292..8d19c45527 100644 --- a/libs/renderengine/Android.bp +++ b/libs/renderengine/Android.bp @@ -133,8 +133,6 @@ cc_library_static { "-fvisibility=hidden", "-Werror=format", "-Wno-unused-parameter", - // TODO: Investigate reducing pinned-memory usage (b/263377839) - "-DRE_SKIAVK", ], srcs: [ ":librenderengine_sources", diff --git a/libs/renderengine/RenderEngine.cpp b/libs/renderengine/RenderEngine.cpp index 341c011dc9..d08c2213ad 100644 --- a/libs/renderengine/RenderEngine.cpp +++ b/libs/renderengine/RenderEngine.cpp @@ -39,12 +39,8 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg ALOGD("RenderEngine with SkiaGL Backend"); return renderengine::skia::SkiaGLRenderEngine::create(args); case RenderEngineType::SKIA_VK: -#ifdef RE_SKIAVK ALOGD("RenderEngine with SkiaVK Backend"); return renderengine::skia::SkiaVkRenderEngine::create(args); -#else - LOG_ALWAYS_FATAL("Requested VK backend, but RE_SKIAVK is not defined!"); -#endif case RenderEngineType::SKIA_GL_THREADED: { ALOGD("Threaded RenderEngine with SkiaGL Backend"); return renderengine::threaded::RenderEngineThreaded::create( @@ -54,16 +50,12 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg args.renderEngineType); } case RenderEngineType::SKIA_VK_THREADED: -#ifdef RE_SKIAVK ALOGD("Threaded RenderEngine with SkiaVK Backend"); return renderengine::threaded::RenderEngineThreaded::create( [args]() { return android::renderengine::skia::SkiaVkRenderEngine::create(args); }, args.renderEngineType); -#else - LOG_ALWAYS_FATAL("Requested VK backend, but RE_SKIAVK is not defined!"); -#endif case RenderEngineType::GLES: default: ALOGD("RenderEngine with GLES Backend"); diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.cpp b/libs/renderengine/skia/SkiaVkRenderEngine.cpp index 2b8495c3f7..f9424f0f15 100644 --- a/libs/renderengine/skia/SkiaVkRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaVkRenderEngine.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -// Allow the SkiaVkRenderEngine class to not be compiled, to save space -// NOTE: In order to build this class, define `RE_SKIAVK` in a build file. -#ifdef RE_SKIAVK - // #define LOG_NDEBUG 0 #undef LOG_TAG #define LOG_TAG "RenderEngine" @@ -677,4 +673,3 @@ void SkiaVkRenderEngine::appendBackendSpecificInfoToDump(std::string& result) { } // namespace skia } // namespace renderengine } // namespace android -#endif // RE_SKIAVK diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.h b/libs/renderengine/skia/SkiaVkRenderEngine.h index 1e42b80c10..2e0cf45220 100644 --- a/libs/renderengine/skia/SkiaVkRenderEngine.h +++ b/libs/renderengine/skia/SkiaVkRenderEngine.h @@ -17,10 +17,6 @@ #ifndef SF_SKIAVKRENDERENGINE_H_ #define SF_SKIAVKRENDERENGINE_H_ -// Allow the SkiaVkRenderEngine class to not be compiled, to save space -// NOTE: In order to build this class, define `RE_SKIAVK` in a build file. -#ifdef RE_SKIAVK - #include <vk/GrVkBackendContext.h> #include "SkiaRenderEngine.h" @@ -59,5 +55,4 @@ private: } // namespace renderengine } // namespace android -#endif // RE_SKIAVK -#endif // SF_SKIAVKRENDERENGINE_H_ +#endif diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp index 7db95a7ea0..f3f2da8a0e 100644 --- a/libs/renderengine/tests/RenderEngineTest.cpp +++ b/libs/renderengine/tests/RenderEngineTest.cpp @@ -112,7 +112,6 @@ public: virtual bool useColorManagement() const = 0; }; -#ifdef RE_SKIAVK class SkiaVkRenderEngineFactory : public RenderEngineFactory { public: std::string name() override { return "SkiaVkRenderEngineFactory"; } @@ -153,8 +152,6 @@ class SkiaVkCMRenderEngineFactory : public SkiaVkRenderEngineFactory { public: bool useColorManagement() const override { return true; } }; -#endif // RE_SKIAVK - class SkiaGLESRenderEngineFactory : public RenderEngineFactory { public: std::string name() override { return "SkiaGLRenderEngineFactory"; } @@ -1560,17 +1557,11 @@ void RenderEngineTest::tonemap(ui::Dataspace sourceDataspace, std::function<vec3 expectBufferColor(Rect(kGreyLevels, 1), generator, 2); } -#ifdef RE_SKIAVK INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest, testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(), std::make_shared<SkiaGLESCMRenderEngineFactory>(), std::make_shared<SkiaVkRenderEngineFactory>(), std::make_shared<SkiaVkCMRenderEngineFactory>())); -#else // RE_SKIAVK -INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest, - testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(), - std::make_shared<SkiaGLESCMRenderEngineFactory>())); -#endif // RE_SKIAVK TEST_P(RenderEngineTest, drawLayers_noLayersToDraw) { if (!GetParam()->typeSupported()) { |