Merge "Revert "libhwui: avoid creating GPU context in Zygote"" (eb6d60e5) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/RenderThread.cpp

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,6 @@ void RenderThread::initializeChoreographer() {
	}		}

	void RenderThread::initThreadLocals() {		void RenderThread::initThreadLocals() {
	HardwareBitmapUploader::initialize();
	setupFrameInterval();		setupFrameInterval();
	initializeChoreographer();		initializeChoreographer();
	mEglManager = new EglManager();		mEglManager = new EglManager();
	@@ -391,12 +390,10 @@ void RenderThread::preload() {
	if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {		if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {
	std::thread eglInitThread([]() { eglGetDisplay(EGL_DEFAULT_DISPLAY); });		std::thread eglInitThread([]() { eglGetDisplay(EGL_DEFAULT_DISPLAY); });
	eglInitThread.detach();		eglInitThread.detach();
			} else {
			requireVkContext();
	}		}
	// TODO: uncomment only after http://b/135536511 is fixed.		HardwareBitmapUploader::initialize();
	// else {
	// uint32_t apiVersion;
	// vkEnumerateInstanceVersion(&apiVersion);
	//}
	}		}

	} /* namespace renderthread */		} /* namespace renderthread */