diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-05 04:08:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-05 04:08:53 +0000 |
| commit | 5577f1b98f12e403acaaaae18a4ee47a481d823d (patch) | |
| tree | 73cc114e59c755de59408549e399ffded7838d33 /libs/hwui/renderthread/RenderThread.cpp | |
| parent | 2406f12e348d01a9d274be5a8fb9765118db8a95 (diff) | |
| parent | 20a2484e580ad3e312fe2fd84ce2a0662af78484 (diff) | |
Snap for 5282916 from 20a2484e580ad3e312fe2fd84ce2a0662af78484 to qt-release
Change-Id: I3f45fa6aea85282bc6d0ad22062519eb52ccbd5a
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 8bef35915c4d..3b37c83a6acc 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -203,11 +203,17 @@ void RenderThread::requireGlContext() { void RenderThread::destroyRenderingContext() { mFunctorManager.onContextDestroyed(); - if (mEglManager->hasEglContext()) { - setGrContext(nullptr); - mEglManager->destroy(); + if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) { + if (mEglManager->hasEglContext()) { + setGrContext(nullptr); + mEglManager->destroy(); + } + } else { + if (vulkanManager().hasVkContext()) { + setGrContext(nullptr); + vulkanManager().destroy(); + } } - vulkanManager().destroy(); } void RenderThread::dumpGraphicsMemory(int fd) { |