Merge "RE-on-SK The First Steps" (2d763ab5) · Commits · e / os / android_frameworks_native-old

libs/renderengine/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ cc_defaults {
		"libui",
		"libutils",
		],
		whole_static_libs: ["libskia"],
		local_include_dirs: ["include"],
		export_include_dirs: ["include"],
		}
		@@ -71,6 +72,14 @@ filegroup {
		],
		}

		filegroup {
		name: "librenderengine_skia_sources",
		srcs: [
		"skia/SkiaRenderEngine.cpp",
		"skia/SkiaGLRenderEngine.cpp",
		],
		}

		cc_library_static {
		name: "librenderengine",
		defaults: ["librenderengine_defaults"],
		@@ -84,6 +93,7 @@ cc_library_static {
		":librenderengine_sources",
		":librenderengine_gl_sources",
		":librenderengine_threaded_sources",
		":librenderengine_skia_sources",
		],
		lto: {
		thin: true,

+7 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		#include "gl/GLESRenderEngine.h"
		#include "threaded/RenderEngineThreaded.h"

		#include "skia/SkiaGLRenderEngine.h"

		namespace android {
		namespace renderengine {

		@@ -37,12 +39,17 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
		if (strcmp(prop, "threaded") == 0) {
		renderEngineType = RenderEngineType::THREADED;
		}
		if (strcmp(prop, "skiagl") == 0) {
		renderEngineType = RenderEngineType::SKIA_GL;
		}

		switch (renderEngineType) {
		case RenderEngineType::THREADED:
		ALOGD("Threaded RenderEngine with GLES Backend");
		return renderengine::threaded::RenderEngineThreaded::create(
		[args]() { return android::renderengine::gl::GLESRenderEngine::create(args); });
		case RenderEngineType::SKIA_GL:
		return renderengine::skia::SkiaGLRenderEngine::create(args);
		case RenderEngineType::GLES:
		default:
		ALOGD("RenderEngine with GLES Backend");

+1 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public:
		enum class RenderEngineType {
		GLES = 1,
		THREADED = 2,
		SKIA_GL = 3,
		};

		static std::unique_ptr<RenderEngine> create(const RenderEngineCreationArgs& args);

0 → 100644

+539 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+93 −0

File added.

Preview size limit exceeded, changes collapsed.