diff options
| author | Jesse Hall <jessehall@google.com> | 2013-08-20 16:11:50 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-08-20 16:11:50 -0700 |
| commit | 353ddc6e77816352107537c215dc8302f6e8587a (patch) | |
| tree | 00f39549b94fa53fa63b9e8cf52501d5925e3f8f /services | |
| parent | 8b308ed70ed782f68c8075aac2a6b66bbfcdb9af (diff) | |
| download | frameworks_native-353ddc6e77816352107537c215dc8302f6e8587a.zip frameworks_native-353ddc6e77816352107537c215dc8302f6e8587a.tar.gz frameworks_native-353ddc6e77816352107537c215dc8302f6e8587a.tar.bz2 | |
Fix HWComposer dumping of float source crops
Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index ef07f18..e7d0d23 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -987,9 +987,9 @@ void HWComposer::dump(String8& result) const { disp.list->numHwLayers, disp.list->flags); result.append( - " type | handle | hints | flags | tr | blend | format | source crop | frame name \n" - "------------+----------+----------+----------+----+-------+----------+---------------------------+--------------------------------\n"); - // " __________ | ________ | ________ | ________ | __ | _____ | ________ | [_____,_____,_____,_____] | [_____,_____,_____,_____] + " type | handle | hints | flags | tr | blend | format | source crop | frame name \n" + "------------+----------+----------+----------+----+-------+----------+---------------------------------+--------------------------------\n"); + // " __________ | ________ | ________ | ________ | __ | _____ | ________ | [_____._,_____._,_____._,_____._] | [_____,_____,_____,_____] for (size_t i=0 ; i<disp.list->numHwLayers ; i++) { const hwc_layer_1_t&l = disp.list->hwLayers[i]; int32_t format = -1; @@ -1020,13 +1020,23 @@ void HWComposer::dump(String8& result) const { if (type >= NELEM(compositionTypeName)) type = NELEM(compositionTypeName) - 1; - result.appendFormat( - " %10s | %08x | %08x | %08x | %02x | %05x | %08x | [%5d,%5d,%5d,%5d] | [%5d,%5d,%5d,%5d] %s\n", - compositionTypeName[type], - 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, - name.string()); + if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) { + result.appendFormat( + " %10s | %08x | %08x | %08x | %02x | %05x | %08x | [%7.1f,%7.1f,%7.1f,%7.1f] | [%5d,%5d,%5d,%5d] %s\n", + compositionTypeName[type], + intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format, + l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom, + l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom, + name.string()); + } else { + result.appendFormat( + " %10s | %08x | %08x | %08x | %02x | %05x | %08x | [%7d,%7d,%7d,%7d] | [%5d,%5d,%5d,%5d] %s\n", + compositionTypeName[type], + 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, + name.string()); + } } } } |