ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix HWComposer dumping of float source crops" into klp-dev

Browse Source
This commit is contained in:
Jesse Hall 2013-08-21 14:37:50 +00:00 committed by Android (Google) Code Review
commit 7127d17db1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -987,9 +987,9 @@ void HWComposer::dump(String8& result) const {
disp.list->numHwLayers, disp.list->flags); disp.list->numHwLayers, disp.list->flags);
result.append( result.append(
" type | handle | hints | flags | tr | blend | format | source crop | frame name \n" " type | handle | hints | flags | tr | blend | format | source crop | frame name \n"
"------------+----------+----------+----------+----+-------+----------+---------------------------+--------------------------------\n"); "------------+----------+----------+----------+----+-------+----------+---------------------------------+--------------------------------\n");
// " __________ | ________ | ________ | ________ | __ | _____ | ________ | [_____,_____,_____,_____] | [_____,_____,_____,_____] // " __________ | ________ | ________ | ________ | __ | _____ | ________ | [_____._,_____._,_____._,_____._] | [_____,_____,_____,_____]
for (size_t i=0 ; i<disp.list->numHwLayers ; i++) { for (size_t i=0 ; i<disp.list->numHwLayers ; i++) {
const hwc_layer_1_t&l = disp.list->hwLayers[i]; const hwc_layer_1_t&l = disp.list->hwLayers[i];
int32_t format = -1; int32_t format = -1;
@ -1020,13 +1020,23 @@ void HWComposer::dump(String8& result) const {
if (type >= NELEM(compositionTypeName)) if (type >= NELEM(compositionTypeName))
type = NELEM(compositionTypeName) - 1; type = NELEM(compositionTypeName) - 1;
result.appendFormat( if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
" %10s | %08x | %08x | %08x | %02x | %05x | %08x | [%5d,%5d,%5d,%5d] | [%5d,%5d,%5d,%5d] %s\n", result.appendFormat(
compositionTypeName[type], " %10s | %08x | %08x | %08x | %02x | %05x | %08x | [%7.1f,%7.1f,%7.1f,%7.1f] | [%5d,%5d,%5d,%5d] %s\n",
intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format, compositionTypeName[type],
l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom, intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom, l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom,
name.string()); 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());
}
} }
} }
} }