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

Update HWC dump format

Browse Source 
Shortens a few fields.  Displays the format as a string.

Change-Id: Ib471f05603763e250bad165db610f8e173e8423a
This commit is contained in:
Andy McFadden 2014-04-21 18:08:54 -07:00
parent 017a538516
commit 4df87bd1f6
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1020,9 +1020,27 @@ HWComposer::LayerListIterator HWComposer::end(int32_t id) {
return getLayerIterator(id, numLayers); return getLayerIterator(id, numLayers);
} }
// Converts a PixelFormat to a human-readable string. Max 11 chars.
// (Could use a table of prefab String8 objects.)
static String8 getFormatStr(PixelFormat format) {
switch (format) {
case PIXEL_FORMAT_RGBA_8888: return String8("RGBA_8888");
case PIXEL_FORMAT_RGBX_8888: return String8("RGBx_8888");
case PIXEL_FORMAT_RGB_888: return String8("RGB_888");
case PIXEL_FORMAT_RGB_565: return String8("RGB_565");
case PIXEL_FORMAT_BGRA_8888: return String8("BGRA_8888");
case PIXEL_FORMAT_sRGB_A_8888: return String8("sRGB_A_8888");
case PIXEL_FORMAT_sRGB_X_8888: return String8("sRGB_x_8888");
default:
String8 result;
result.appendFormat("? %08x", format);
return result;
}
}
void HWComposer::dump(String8& result) const { void HWComposer::dump(String8& result) const {
if (mHwc) { if (mHwc) {
result.appendFormat("Hardware Composer state (version %8x):\n", hwcApiVersion(mHwc)); result.appendFormat("Hardware Composer state (version %08x):\n", hwcApiVersion(mHwc));
result.appendFormat(" mDebugForceFakeVSync=%d\n", mDebugForceFakeVSync); result.appendFormat(" mDebugForceFakeVSync=%d\n", mDebugForceFakeVSync);
for (size_t i=0 ; i<mNumDisplays ; i++) { for (size_t i=0 ; i<mNumDisplays ; i++) {
const DisplayData& disp(mDisplayData[i]); const DisplayData& disp(mDisplayData[i]);
@ -1042,9 +1060,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 | hint | flag | tr | blnd | format | source crop (l,t,r,b) | 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;
@ -1069,25 +1087,26 @@ void HWComposer::dump(String8& result) const {
static char const* compositionTypeName[] = { static char const* compositionTypeName[] = {
"GLES", "GLES",
"HWC", "HWC",
"BACKGROUND", "BKGND",
"FB TARGET", "FB TARGET",
"UNKNOWN"}; "UNKNOWN"};
if (type >= NELEM(compositionTypeName)) if (type >= NELEM(compositionTypeName))
type = NELEM(compositionTypeName) - 1; type = NELEM(compositionTypeName) - 1;
String8 formatStr = getFormatStr(format);
if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) { if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
result.appendFormat( result.appendFormat(
" %10s | %08" PRIxPTR " | %08x | %08x | %02x | %05x | %08x | [%7.1f,%7.1f,%7.1f,%7.1f] | [%5d,%5d,%5d,%5d] %s\n", " %9s | %08" PRIxPTR " | %04x | %04x | %02x | %04x | %-11s |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d | %s\n",
compositionTypeName[type], compositionTypeName[type],
intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format, intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom, l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom, l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,
name.string()); name.string());
} else { } else {
result.appendFormat( result.appendFormat(
" %10s | %08" PRIxPTR " | %08x | %08x | %02x | %05x | %08x | [%7d,%7d,%7d,%7d] | [%5d,%5d,%5d,%5d] %s\n", " %9s | %08" PRIxPTR " | %04x | %04x | %02x | %04x | %-11s |%7d,%7d,%7d,%7d |%5d,%5d,%5d,%5d | %s\n",
compositionTypeName[type], compositionTypeName[type],
intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, format, intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom, l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom, l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,
name.string()); name.string());

8
services/surfaceflinger/Layer.h
View File

@ -76,6 +76,10 @@ public:
Region visibleRegion; Region visibleRegion;
Region coveredRegion; Region coveredRegion;
Region visibleNonTransparentRegion; Region visibleNonTransparentRegion;
// Layer serial number. This gives layers an explicit ordering, so we
// have a stable sort order when their layer stack and Z-order are
// the same.
int32_t sequence; int32_t sequence;
enum { // flags for doTransaction() enum { // flags for doTransaction()
@ -341,7 +345,7 @@ private:
// constants // constants
sp<SurfaceFlingerConsumer> mSurfaceFlingerConsumer; sp<SurfaceFlingerConsumer> mSurfaceFlingerConsumer;
sp<IGraphicBufferProducer> mProducer; sp<IGraphicBufferProducer> mProducer;
uint32_t mTextureName; uint32_t mTextureName; // from GLES
bool mPremultipliedAlpha; bool mPremultipliedAlpha;
String8 mName; String8 mName;
mutable bool mDebug; mutable bool mDebug;
@ -372,7 +376,7 @@ private:
bool mNeedsFiltering; bool mNeedsFiltering;
// The mesh used to draw the layer in GLES composition mode // The mesh used to draw the layer in GLES composition mode
mutable Mesh mMesh; mutable Mesh mMesh;
// The mesh used to draw the layer in GLES composition mode // The texture used to draw the layer in GLES composition mode
mutable Texture mTexture; mutable Texture mTexture;
// page-flip thread (currently main thread) // page-flip thread (currently main thread)