summaryrefslogtreecommitdiffstats
path: root/libs/hwui
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-05 23:22:43 +0000
committerSteve Block <steveblock@google.com>2012-01-06 10:07:54 +0000
commit8564c8da817a845353d213acd8636b76f567b234 (patch)
tree71acbd8ace822c769aef917629bf5a079f63274d /libs/hwui
parentc42e6a0bed2c88fd03466c5104d62d7f98e68768 (diff)
downloadframeworks_base-8564c8da817a845353d213acd8636b76f567b234.zip
frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.gz
frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.bz2
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Diffstat (limited to 'libs/hwui')
-rw-r--r--libs/hwui/Caches.cpp2
-rw-r--r--libs/hwui/LayerRenderer.cpp6
-rw-r--r--libs/hwui/ShapeCache.h2
-rw-r--r--libs/hwui/TextureCache.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index fa1e9b8..d1af1a3 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -50,7 +50,7 @@ Caches::Caches(): Singleton<Caches>(), mInitialized(false) {
GLint maxTextureUnits;
glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxTextureUnits);
if (maxTextureUnits < REQUIRED_TEXTURE_UNITS_COUNT) {
- LOGW("At least %d texture units are required!", REQUIRED_TEXTURE_UNITS_COUNT);
+ ALOGW("At least %d texture units are required!", REQUIRED_TEXTURE_UNITS_COUNT);
}
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index f122396..e320eb2 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -185,14 +185,14 @@ Layer* LayerRenderer::createLayer(uint32_t width, uint32_t height, bool isOpaque
Caches& caches = Caches::getInstance();
GLuint fbo = caches.fboCache.get();
if (!fbo) {
- LOGW("Could not obtain an FBO");
+ ALOGW("Could not obtain an FBO");
return NULL;
}
caches.activeTexture(0);
Layer* layer = caches.layerCache.get(width, height);
if (!layer) {
- LOGW("Could not obtain a layer");
+ ALOGW("Could not obtain a layer");
return NULL;
}
@@ -360,7 +360,7 @@ bool LayerRenderer::copyLayer(Layer* layer, SkBitmap* bitmap) {
GLuint fbo = caches.fboCache.get();
if (!fbo) {
- LOGW("Could not obtain an FBO");
+ ALOGW("Could not obtain an FBO");
return false;
}
diff --git a/libs/hwui/ShapeCache.h b/libs/hwui/ShapeCache.h
index 2c0f3ab..b60ef4c 100644
--- a/libs/hwui/ShapeCache.h
+++ b/libs/hwui/ShapeCache.h
@@ -503,7 +503,7 @@ PathTexture* ShapeCache<Entry>::addTexture(const Entry& entry, const SkPath *pat
const uint32_t height = uint32_t(pathHeight + offset * 2.0 + 0.5);
if (width > mMaxTextureSize || height > mMaxTextureSize) {
- LOGW("Shape %s too large to be rendered into a texture (%dx%d, max=%dx%d)",
+ ALOGW("Shape %s too large to be rendered into a texture (%dx%d, max=%dx%d)",
mName, width, height, mMaxTextureSize, mMaxTextureSize);
return NULL;
}
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
index 237911b..3f46a30 100644
--- a/libs/hwui/TextureCache.cpp
+++ b/libs/hwui/TextureCache.cpp
@@ -125,7 +125,7 @@ Texture* TextureCache::get(SkBitmap* bitmap) {
if (!texture) {
if (bitmap->width() > mMaxTextureSize || bitmap->height() > mMaxTextureSize) {
- LOGW("Bitmap too large to be uploaded into a texture (%dx%d, max=%dx%d)",
+ ALOGW("Bitmap too large to be uploaded into a texture (%dx%d, max=%dx%d)",
bitmap->width(), bitmap->height(), mMaxTextureSize, mMaxTextureSize);
return NULL;
}
@@ -249,7 +249,7 @@ void TextureCache::generateTexture(SkBitmap* bitmap, Texture* texture, bool rege
texture->blend = !bitmap->isOpaque();
break;
default:
- LOGW("Unsupported bitmap config: %d", bitmap->getConfig());
+ ALOGW("Unsupported bitmap config: %d", bitmap->getConfig());
break;
}