Merge "Remove RE_SKIAVK ifdefs (always Compile SkiaVkRenderEngine)" (c21f6d14) · Commits · e / os / android_frameworks_native

libs/renderengine/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -133,8 +133,6 @@ cc_library_static {
	"-fvisibility=hidden",		"-fvisibility=hidden",
	"-Werror=format",		"-Werror=format",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	// TODO: Investigate reducing pinned-memory usage (b/263377839)
	"-DRE_SKIAVK",
	],		],
	srcs: [		srcs: [
	":librenderengine_sources",		":librenderengine_sources",

libs/renderengine/RenderEngine.cpp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -39,12 +39,8 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
	ALOGD("RenderEngine with SkiaGL Backend");		ALOGD("RenderEngine with SkiaGL Backend");
	return renderengine::skia::SkiaGLRenderEngine::create(args);		return renderengine::skia::SkiaGLRenderEngine::create(args);
	case RenderEngineType::SKIA_VK:		case RenderEngineType::SKIA_VK:
	#ifdef RE_SKIAVK
	ALOGD("RenderEngine with SkiaVK Backend");		ALOGD("RenderEngine with SkiaVK Backend");
	return renderengine::skia::SkiaVkRenderEngine::create(args);		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: {		case RenderEngineType::SKIA_GL_THREADED: {
	ALOGD("Threaded RenderEngine with SkiaGL Backend");		ALOGD("Threaded RenderEngine with SkiaGL Backend");
	return renderengine::threaded::RenderEngineThreaded::create(		return renderengine::threaded::RenderEngineThreaded::create(
	@@ -54,16 +50,12 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
	args.renderEngineType);		args.renderEngineType);
	}		}
	case RenderEngineType::SKIA_VK_THREADED:		case RenderEngineType::SKIA_VK_THREADED:
	#ifdef RE_SKIAVK
	ALOGD("Threaded RenderEngine with SkiaVK Backend");		ALOGD("Threaded RenderEngine with SkiaVK Backend");
	return renderengine::threaded::RenderEngineThreaded::create(		return renderengine::threaded::RenderEngineThreaded::create(
	[args]() {		[args]() {
	return android::renderengine::skia::SkiaVkRenderEngine::create(args);		return android::renderengine::skia::SkiaVkRenderEngine::create(args);
	},		},
	args.renderEngineType);		args.renderEngineType);
	#else
	LOG_ALWAYS_FATAL("Requested VK backend, but RE_SKIAVK is not defined!");
	#endif
	case RenderEngineType::GLES:		case RenderEngineType::GLES:
	default:		default:
	ALOGD("RenderEngine with GLES Backend");		ALOGD("RenderEngine with GLES Backend");

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@
	* limitations under the License.		* 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		// #define LOG_NDEBUG 0
	#undef LOG_TAG		#undef LOG_TAG
	#define LOG_TAG "RenderEngine"		#define LOG_TAG "RenderEngine"
	@@ -677,4 +673,3 @@ void SkiaVkRenderEngine::appendBackendSpecificInfoToDump(std::string& result) {
	} // namespace skia		} // namespace skia
	} // namespace renderengine		} // namespace renderengine
	} // namespace android		} // namespace android
	#endif // RE_SKIAVK

libs/renderengine/skia/SkiaVkRenderEngine.h

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,6 @@
	#ifndef SF_SKIAVKRENDERENGINE_H_		#ifndef SF_SKIAVKRENDERENGINE_H_
	#define 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 <vk/GrVkBackendContext.h>

	#include "SkiaRenderEngine.h"		#include "SkiaRenderEngine.h"
	@@ -59,5 +55,4 @@ private:
	} // namespace renderengine		} // namespace renderengine
	} // namespace android		} // namespace android

	#endif // RE_SKIAVK		#endif
	#endif // SF_SKIAVKRENDERENGINE_H_

libs/renderengine/tests/RenderEngineTest.cpp

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -112,7 +112,6 @@ public:
	virtual bool useColorManagement() const = 0;		virtual bool useColorManagement() const = 0;
	};		};

	#ifdef RE_SKIAVK
	class SkiaVkRenderEngineFactory : public RenderEngineFactory {		class SkiaVkRenderEngineFactory : public RenderEngineFactory {
	public:		public:
	std::string name() override { return "SkiaVkRenderEngineFactory"; }		std::string name() override { return "SkiaVkRenderEngineFactory"; }
	@@ -153,8 +152,6 @@ class SkiaVkCMRenderEngineFactory : public SkiaVkRenderEngineFactory {
	public:		public:
	bool useColorManagement() const override { return true; }		bool useColorManagement() const override { return true; }
	};		};
	#endif // RE_SKIAVK

	class SkiaGLESRenderEngineFactory : public RenderEngineFactory {		class SkiaGLESRenderEngineFactory : public RenderEngineFactory {
	public:		public:
	std::string name() override { return "SkiaGLRenderEngineFactory"; }		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);		expectBufferColor(Rect(kGreyLevels, 1), generator, 2);
	}		}

	#ifdef RE_SKIAVK
	INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest,		INSTANTIATE_TEST_SUITE_P(PerRenderEngineType, RenderEngineTest,
	testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(),		testing::Values(std::make_shared<SkiaGLESRenderEngineFactory>(),
	std::make_shared<SkiaGLESCMRenderEngineFactory>(),		std::make_shared<SkiaGLESCMRenderEngineFactory>(),
	std::make_shared<SkiaVkRenderEngineFactory>(),		std::make_shared<SkiaVkRenderEngineFactory>(),
	std::make_shared<SkiaVkCMRenderEngineFactory>()));		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) {		TEST_P(RenderEngineTest, drawLayers_noLayersToDraw) {
	if (!GetParam()->typeSupported()) {		if (!GetParam()->typeSupported()) {