diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-31 22:22:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-31 22:22:22 +0000 |
| commit | eb6d60e5f5474d7e8a002ebe535c8aee2fc6624e (patch) | |
| tree | 2760594b34df1231f06853182c0685ee6a7667b1 /libs/hwui/renderthread/RenderThread.cpp | |
| parent | 9cf71c2629f20effe37bc0308bc4867351f06e30 (diff) | |
| parent | bf371750449b67116141397c5cfd0e05db592c59 (diff) | |
Merge "Revert "libhwui: avoid creating GPU context in Zygote""
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index bea6121905a5..565fb61c8994 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -162,7 +162,6 @@ void RenderThread::initializeChoreographer() { } void RenderThread::initThreadLocals() { - HardwareBitmapUploader::initialize(); setupFrameInterval(); initializeChoreographer(); mEglManager = new EglManager(); @@ -391,12 +390,10 @@ void RenderThread::preload() { if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) { std::thread eglInitThread([]() { eglGetDisplay(EGL_DEFAULT_DISPLAY); }); eglInitThread.detach(); + } else { + requireVkContext(); } - // TODO: uncomment only after http://b/135536511 is fixed. - // else { - // uint32_t apiVersion; - // vkEnumerateInstanceVersion(&apiVersion); - //} + HardwareBitmapUploader::initialize(); } } /* namespace renderthread */ |