summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-09-29 18:34:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-29 18:34:22 -0700
commit5d9a4f33d3f1fcce55b686597d370d749b5c5c0d (patch)
treed5429ef752d292bae0dbcc0fcc930ca71420b0aa
parente8b7f4a20c43d8f55d0cf85a94363b764ba598b8 (diff)
parent1f84f44bfa7d015b362138817e6c7063b7d1fd9e (diff)
downloadframeworks_base-5d9a4f33d3f1fcce55b686597d370d749b5c5c0d.zip
frameworks_base-5d9a4f33d3f1fcce55b686597d370d749b5c5c0d.tar.gz
frameworks_base-5d9a4f33d3f1fcce55b686597d370d749b5c5c0d.tar.bz2
Merge "improve hwc log output" into ics-factoryrom
-rw-r--r--services/surfaceflinger/DisplayHardware/HWComposer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index e707bdc..879e858 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -176,9 +176,9 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE,
mList->numHwLayers, mList->flags);
result.append(buffer);
result.append(
- " type | hints | flags | tr | blend | format | source rectangle | crop rectangle name \n"
- "-----------+----------+----------+----+-------+----------+---------------------------+--------------------------------\n");
- // " ________ | ________ | ________ | __ | _____ | ________ | [_____,_____,_____,_____] | [_____,_____,_____,_____]
+ " type | handle | hints | flags | tr | blend | format | source crop | frame name \n"
+ "----------+----------+----------+----------+----+-------+----------+---------------------------+--------------------------------\n");
+ // " ________ | ________ | ________ | ________ | __ | _____ | ________ | [_____,_____,_____,_____] | [_____,_____,_____,_____]
for (size_t i=0 ; i<mList->numHwLayers ; i++) {
const hwc_layer_t& l(mList->hwLayers[i]);
const sp<LayerBase> layer(visibleLayersSortedByZ[i]);
@@ -190,9 +190,9 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE,
}
}
snprintf(buffer, SIZE,
- " %8s | %08x | %08x | %02x | %05x | %08x | [%5d,%5d,%5d,%5d] | [%5d,%5d,%5d,%5d] %s\n",
+ " %8s | %08x | %08x | %08x | %02x | %05x | %08x | [%5d,%5d,%5d,%5d] | [%5d,%5d,%5d,%5d] %s\n",
l.compositionType ? "OVERLAY" : "FB",
- l.hints, l.flags, l.transform, l.blending, format,
+ intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format,
l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,
layer->getName().string());