From c77162c2df4ea1d1fb3310e5f16cbcffe73f088d Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 16 Nov 2021 17:13:08 -0500 Subject: Move sysprop check for RenderEngineType into SF As brought up in I455d5d613ccaa210dc748969e025dc86c78080b8, we should read the sysprop in SF, so that clients (e.g. tests or benchmarks) that specify using a particular Type actually use that type, regardless of any sysprop set. If the sysprop is not set, or is set to an invalid value, just respect the default that is already set by RenderEngineCreationArgs::Builder. Bug: 193240340 Test: adb shell setprop debug.renderengine.backend verify via logcat that the proper type is used Change-Id: Iaf425fde6333f54d5b190df66cb7a79e1d491e63 --- libs/renderengine/RenderEngine.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'libs/renderengine/RenderEngine.cpp') diff --git a/libs/renderengine/RenderEngine.cpp b/libs/renderengine/RenderEngine.cpp index 65d48951c6..c7ad058ab9 100644 --- a/libs/renderengine/RenderEngine.cpp +++ b/libs/renderengine/RenderEngine.cpp @@ -26,23 +26,7 @@ namespace android { namespace renderengine { -std::unique_ptr RenderEngine::create(RenderEngineCreationArgs args) { - // Keep the ability to override by PROPERTIES: - char prop[PROPERTY_VALUE_MAX]; - property_get(PROPERTY_DEBUG_RENDERENGINE_BACKEND, prop, ""); - if (strcmp(prop, "gles") == 0) { - args.renderEngineType = RenderEngineType::GLES; - } - if (strcmp(prop, "threaded") == 0) { - args.renderEngineType = RenderEngineType::THREADED; - } - if (strcmp(prop, "skiagl") == 0) { - args.renderEngineType = RenderEngineType::SKIA_GL; - } - if (strcmp(prop, "skiaglthreaded") == 0) { - args.renderEngineType = RenderEngineType::SKIA_GL_THREADED; - } - +std::unique_ptr RenderEngine::create(const RenderEngineCreationArgs& args) { switch (args.renderEngineType) { case RenderEngineType::THREADED: ALOGD("Threaded RenderEngine with GLES Backend"); -- cgit v1.2.3-59-g8ed1b