diff options
| author | 2014-11-20 17:27:36 -0800 | |
|---|---|---|
| committer | 2014-11-20 17:27:36 -0800 | |
| commit | 06e7fe5a70409d2050b2b3e1286500f5223099da (patch) | |
| tree | b7eea29ebe9ffc345f68a879199e2904c5c78423 /libs/hwui/TextureCache.cpp | |
| parent | b946358bb5afd9db6a0914171d3f237c77abbfea (diff) | |
| parent | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 (diff) | |
resolve merge conflicts of f2235b6 to master.
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
Diffstat (limited to 'libs/hwui/TextureCache.cpp')
| -rw-r--r-- | libs/hwui/TextureCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index 0cd120a581da..b1fa3835d3c8 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -27,6 +27,7 @@ #include "Texture.h" #include "TextureCache.h" #include "Properties.h" +#include "utils/TraceUtils.h" namespace android { namespace uirenderer { @@ -267,7 +268,7 @@ void TextureCache::generateTexture(const SkBitmap* bitmap, Texture* texture, boo return; } - ATRACE_CALL(); + ATRACE_FORMAT("Upload %ux%u Texture", bitmap->width(), bitmap->height()); // We could also enable mipmapping if both bitmap dimensions are powers // of 2 but we'd have to deal with size changes. Let's keep this simple |