diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-06-03 04:53:05 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-06-03 04:53:05 +0400 |
| commit | 28fa43d18c3c2dc9bf8621c9a056e13e151c1cf1 (patch) | |
| tree | 777b0156b7ce5b8bfd86c208db93fb1d8e94487c /services | |
| parent | b71b483a40cf604997d889f07735b6d80909f4a6 (diff) | |
| parent | 2a18e9afe5d88df9f827a4c12b891fb0bfd61aef (diff) | |
| download | frameworks_base-28fa43d18c3c2dc9bf8621c9a056e13e151c1cf1.zip frameworks_base-28fa43d18c3c2dc9bf8621c9a056e13e151c1cf1.tar.gz frameworks_base-28fa43d18c3c2dc9bf8621c9a056e13e151c1cf1.tar.bz2 | |
Merge "SurfaceFlinger: Set the transform value correctly" into ics
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 34de259..92e8355 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -212,8 +212,13 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE, } snprintf(buffer, SIZE, " %8s | %08x | %08x | %08x | %02x | %05x | %08x | [%5d,%5d,%5d,%5d] | [%5d,%5d,%5d,%5d] %s\n", +#ifdef QCOM_HARDWARE + l.compositionType ? (l.compositionType == HWC_OVERLAY ? "OVERLAY" : "COPYBIT") : "FB", + intptr_t(l.handle), l.hints, l.flags, l.transform & FINAL_TRANSFORM_MASK, l.blending, format, +#else l.compositionType ? "OVERLAY" : "FB", intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format, +#endif 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()); |