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

Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0

Browse Source
This commit is contained in:
Mathias Agopian
2011-10-16 21:08:00 -07:00
committed by Android (Google) Code Review
parent fefffc685a e757a87ff1
commit 4fb6416e3a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -452,7 +452,7 @@ bool SurfaceFlinger::threadLoop()
} }
const DisplayHardware& hw(graphicPlane(0).displayHardware()); const DisplayHardware& hw(graphicPlane(0).displayHardware());
if (LIKELY(hw.canDraw() && !isFrozen())) { if (LIKELY(hw.canDraw())) {
// repaint the framebuffer (if needed) // repaint the framebuffer (if needed)
const int index = hw.getCurrentBufferIndex(); const int index = hw.getCurrentBufferIndex();
@@ -479,15 +479,13 @@ bool SurfaceFlinger::threadLoop()
void SurfaceFlinger::postFramebuffer() void SurfaceFlinger::postFramebuffer()
{ {
if (!mSwapRegion.isEmpty()) { const DisplayHardware& hw(graphicPlane(0).displayHardware());
const DisplayHardware& hw(graphicPlane(0).displayHardware()); const nsecs_t now = systemTime();
const nsecs_t now = systemTime(); mDebugInSwapBuffers = now;
mDebugInSwapBuffers = now; hw.flip(mSwapRegion);
hw.flip(mSwapRegion); mLastSwapBufferTime = systemTime() - now;
mLastSwapBufferTime = systemTime() - now; mDebugInSwapBuffers = 0;
mDebugInSwapBuffers = 0; mSwapRegion.clear();
mSwapRegion.clear();
}
} }
void SurfaceFlinger::handleConsoleEvents() void SurfaceFlinger::handleConsoleEvents()