diff options
| author | 2013-02-22 21:45:56 +0000 | |
|---|---|---|
| committer | 2013-02-22 21:45:57 +0000 | |
| commit | 505d1d64eda6e47caabf8701cb39ec9b176b3238 (patch) | |
| tree | 99fa418bf15f26afdcfddc1ae1936e4de809ddfa | |
| parent | ec39a94ac299e57c800a82814651c713f3a5f5c7 (diff) | |
| parent | 7031ff68bb998dbbd7caf3b2fd75eef747a86725 (diff) | |
Merge "Prettify display lists logging"
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 8 | ||||
| -rw-r--r-- | libs/hwui/DisplayList.h | 4 | ||||
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 6 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index 8bfbf22fbfaa..744edcaf5932 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -251,16 +251,18 @@ size_t DisplayList::getSize() { * display list. This function should remain in sync with the replay() function. */ void DisplayList::output(uint32_t level) { - ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this, + ALOGD("%*sStart display list (%p, %s, render=%d)", (level - 1) * 2, "", this, mName.string(), isRenderable()); + ALOGD("%*s%s %d", level * 2, "", "Save", + SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag); - ALOGD("%*s%s %d", level * 2, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag); outputViewProperties(level); int flags = DisplayListOp::kOpLogFlag_Recurse; for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) { mDisplayListData->displayListOps[i]->output(level, flags); } - ALOGD("%*sDone (%p, %s)", level * 2, "", this, mName.string()); + + ALOGD("%*sDone (%p, %s)", (level - 1) * 2, "", this, mName.string()); } float DisplayList::getPivotX() { diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index f2a23830f66f..feee69c21472 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -17,6 +17,10 @@ #ifndef ANDROID_HWUI_DISPLAY_LIST_H #define ANDROID_HWUI_DISPLAY_LIST_H +#ifndef LOG_TAG + #define LOG_TAG "OpenGLRenderer" +#endif + #include <SkCamera.h> #include <SkMatrix.h> diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 93b281ad84ba..97812d4ba33d 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,10 @@ #ifndef ANDROID_HWUI_DISPLAY_OPERATION_H #define ANDROID_HWUI_DISPLAY_OPERATION_H +#ifndef LOG_TAG + #define LOG_TAG "OpenGLRenderer" +#endif + #include <SkXfermode.h> #include <private/hwui/DrawGlInfo.h> diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index ffad8683bac7..1afeaf0a0444 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1807,7 +1807,7 @@ status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, Rect& dirty, void OpenGLRenderer::outputDisplayList(DisplayList* displayList) { if (displayList) { - displayList->output(0); + displayList->output(1); } } |