Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dequeus outside of frame drawing" into oc-dev

Browse Source 
am: 944b0c73a4

Change-Id: Id9152a19194e1817f83a33b14a6cdccaa84dfeb7
This commit is contained in:
John Reck
2017-06-01 06:17:58 +00:00
committed by android-build-merger
parent b67a128206 944b0c73a4
commit 55302e2f4e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -436,8 +436,15 @@ void CanvasContext::draw() {
swap.vsyncTime = mRenderThread.timeLord().latestVsync();
if (mNativeSurface.get()) {
int durationUs;
mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);
swap.dequeueDuration = us2ns(durationUs);
nsecs_t dequeueStart = mNativeSurface->getLastDequeueStartTime();
if (dequeueStart < mCurrentFrameInfo->get(FrameInfoIndex::Vsync)) {
// Ignoring dequeue duration as it happened prior to vsync
// and thus is not part of the frame.
swap.dequeueDuration = 0;
} else {
mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);
swap.dequeueDuration = us2ns(durationUs);
}
mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs);
swap.queueDuration = us2ns(durationUs);
} else {