Merge "Revert "handle surfaces posts independently from composition""

This commit is contained in:
Mathias Agopian 2012-04-11 20:45:32 -07:00 committed by Android (Google) Code Review
commit 948f390bfd
2 changed files with 13 additions and 7 deletions

View File

@ -133,7 +133,8 @@ status_t MessageQueue::postMessage(
} }
void MessageQueue::invalidate() { void MessageQueue::invalidate() {
mHandler->signalInvalidate(); // mHandler->signalInvalidate();
mEvents->requestNextVsync();
} }
void MessageQueue::refresh() { void MessageQueue::refresh() {

View File

@ -407,7 +407,8 @@ void SurfaceFlinger::onMessageReceived(int32_t what)
{ {
ATRACE_CALL(); ATRACE_CALL();
switch (what) { switch (what) {
case MessageQueue::INVALIDATE: { case MessageQueue::REFRESH: {
// case MessageQueue::INVALIDATE: {
// if we're in a global transaction, don't do anything. // if we're in a global transaction, don't do anything.
const uint32_t mask = eTransactionNeeded | eTraversalNeeded; const uint32_t mask = eTransactionNeeded | eTraversalNeeded;
uint32_t transactionFlags = peekTransactionFlags(mask); uint32_t transactionFlags = peekTransactionFlags(mask);
@ -418,16 +419,20 @@ void SurfaceFlinger::onMessageReceived(int32_t what)
// post surfaces (if needed) // post surfaces (if needed)
handlePageFlip(); handlePageFlip();
signalRefresh(); // signalRefresh();
//
} break; // } break;
//
case MessageQueue::REFRESH: { // case MessageQueue::REFRESH: {
handleRefresh(); handleRefresh();
const DisplayHardware& hw(graphicPlane(0).displayHardware()); const DisplayHardware& hw(graphicPlane(0).displayHardware());
// if (mDirtyRegion.isEmpty()) {
// return;
// }
if (CC_UNLIKELY(mHwWorkListDirty)) { if (CC_UNLIKELY(mHwWorkListDirty)) {
// build the h/w work list // build the h/w work list
handleWorkList(); handleWorkList();