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

am 4329ee25: Merge "Fix off by one error in log tracking" into jb-mr2-dev

Browse Source 
* commit '4329ee25659c27b1cd90f95f127192964346e471':
  Fix off by one error in log tracking
This commit is contained in:
Chris Craik
2013-05-10 12:44:26 -07:00
committed by Android Git Automerger
parent 68c666ebb7 4329ee2565
commit f420a36e5f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/DeferredDisplayList.cpp
View File

@@ -98,8 +98,8 @@ public:
#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS
renderer.eventMark(op->name());
#endif
status |= op->applyDraw(renderer, dirty);
logBuffer.writeCommand(0, op->name());
status |= op->applyDraw(renderer, dirty);
#if DEBUG_MERGE_BEHAVIOR
Rect& bounds = mOps[i]->state.mBounds;
@@ -200,10 +200,10 @@ public:
}
DrawOp* op = mOps[0];
status_t status = op->multiDraw(renderer, dirty, mOps, mBounds);
DisplayListLogBuffer& buffer = DisplayListLogBuffer::getInstance();
buffer.writeCommand(0, "multiDraw");
buffer.writeCommand(1, op->name());
status_t status = op->multiDraw(renderer, dirty, mOps, mBounds);
#if DEBUG_MERGE_BEHAVIOR
renderer.drawScreenSpaceColorRect(mBounds.left, mBounds.top, mBounds.right, mBounds.bottom,

2
libs/hwui/DisplayList.cpp
View File

@@ -511,8 +511,8 @@ void DisplayList::iterate(OpenGLRenderer& renderer, T& handler, const int level)
for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {
DisplayListOp *op = mDisplayListData->displayListOps[i];
handler(op, saveCount, mClipToBounds);
logBuffer.writeCommand(level, op->name());
handler(op, saveCount, mClipToBounds);
}
DISPLAY_LIST_LOGD("%*sRestoreToCount %d", (level + 1) * 2, "", restoreTo);

5
libs/hwui/DisplayListLogBuffer.cpp
View File

@@ -77,12 +77,13 @@ void DisplayListLogBuffer::outputCommands(FILE *file)
if (tmpBufferPtr == mEnd) {
break;
}
fprintf(file, "%*s%s\n", 2 * tmpBufferPtr->level, "", tmpBufferPtr->label);
OpLog* nextOp = tmpBufferPtr++;
if (tmpBufferPtr > mBufferLast) {
tmpBufferPtr = mBufferFirst;
}
fprintf(file, "%*s%s\n", tmpBufferPtr->level*2, "", tmpBufferPtr->label);
}
}