diff options
| author | Steven Laver <lavers@google.com> | 2019-01-20 16:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-20 16:40:46 +0000 |
| commit | c470daee1cf372142e66d4786f98b157f284dacb (patch) | |
| tree | c118879b496f19919078294bd68a7867dc7e5d0f /libs/hwui/renderthread/RenderThread.cpp | |
| parent | be058067720e1688137c15e68d5c4e50c4d66904 (diff) | |
| parent | 67924d836712134f300f2952dad900daa5f3c98d (diff) | |
Merge changes from topic "QP1A.190107.001" into q-keystone-qcom-dev
* changes:
Clear verification completed flag if an optional verifier is used
telephony: hide added members in DisconnectCause
location: fix build errors
Update CarrierIdentifier constructors to match public API signature
remove duplicate 'data_connection_5g'
Move persist.debug.trace handling to frameworks
Merge QP1A.190107.001
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 207673c1c8dd..c06faddf7fa6 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -132,6 +132,7 @@ RenderThread::RenderThread() , mFrameCallbackTaskPending(false) , mRenderState(nullptr) , mEglManager(nullptr) + , mFunctorManager(WebViewFunctorManager::instance()) , mVkManager(nullptr) { Properties::load(); start("RenderThread"); @@ -197,11 +198,13 @@ void RenderThread::requireGlContext() { setGrContext(grContext); } -void RenderThread::destroyGlContext() { +void RenderThread::destroyRenderingContext() { + mFunctorManager.onContextDestroyed(); if (mEglManager->hasEglContext()) { setGrContext(nullptr); mEglManager->destroy(); } + vulkanManager().destroy(); } void RenderThread::dumpGraphicsMemory(int fd) { |