From 353ddc6e77816352107537c215dc8302f6e8587a Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Tue, 20 Aug 2013 16:11:50 -0700 Subject: [PATCH] Fix HWComposer dumping of float source crops Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6 --- .../DisplayHardware/HWComposer.cpp | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index ef07f1882..e7d0d239c 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 ; inumHwLayers ; 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()); + } } } }