diff options
| author | John Reck <jreck@google.com> | 2016-04-11 20:54:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-11 20:54:36 +0000 |
| commit | 825fa4d5ae7b2907ee1769d09e6333306de2a92e (patch) | |
| tree | 26385820dbc923e739d059f9c47197b88634ae22 /libs/hwui/renderthread/DrawFrameTask.cpp | |
| parent | cf0cc881ebf2c2f00129dd9e045e23f6bf970d54 (diff) | |
| parent | eab3f2658aa41d37c3b05d49a2ce4e3f4ed85399 (diff) | |
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
Diffstat (limited to 'libs/hwui/renderthread/DrawFrameTask.cpp')
| -rw-r--r-- | libs/hwui/renderthread/DrawFrameTask.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp index ed472ac4bd02..651aaa23e341 100644 --- a/libs/hwui/renderthread/DrawFrameTask.cpp +++ b/libs/hwui/renderthread/DrawFrameTask.cpp @@ -115,7 +115,7 @@ bool DrawFrameTask::syncFrameState(TreeInfo& info) { ATRACE_CALL(); int64_t vsync = mFrameInfo[static_cast<int>(FrameInfoIndex::Vsync)]; mRenderThread->timeLord().vsyncReceived(vsync); - bool canDraw = mContext->makeCurrent(); + mContext->makeCurrent(); Caches::getInstance().textureCache.resetMarkInUse(mContext); for (size_t i = 0; i < mLayers.size(); i++) { @@ -126,9 +126,8 @@ bool DrawFrameTask::syncFrameState(TreeInfo& info) { // This is after the prepareTree so that any pending operations // (RenderNode tree state, prefetched layers, etc...) will be flushed. - if (CC_UNLIKELY(!mContext->hasSurface() || !canDraw)) { + if (CC_UNLIKELY(!mContext->hasSurface())) { mSyncResult |= kSync_LostSurfaceRewardIfFound; - info.out.canDrawThisFrame = false; } if (info.out.hasAnimations) { |