diff options
| author | 2012-01-09 23:24:46 +0000 | |
|---|---|---|
| committer | 2012-01-09 23:24:46 +0000 | |
| commit | 2e681c1b097883f5c327d3c1c77692ecab498a35 (patch) | |
| tree | 7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /libs/hwui/OpenGLRenderer.cpp | |
| parent | 293fa718102353d7b103f10a7c0f580ba87b3a0f (diff) | |
| parent | 08289f55eae5c4127091360e862f78d57ae24c15 (diff) | |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 910195360d73..12ed2054c3d3 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -172,7 +172,7 @@ void OpenGLRenderer::finish() { ALOGD("GL error from OpenGLRenderer: 0x%x", status); switch (status) { case GL_OUT_OF_MEMORY: - LOGE(" OpenGLRenderer is out of memory!"); + ALOGE(" OpenGLRenderer is out of memory!"); break; } } @@ -538,7 +538,7 @@ bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, sp<Snapshot> sna #if DEBUG_LAYERS_AS_REGIONS GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { - LOGE("Framebuffer incomplete (GL error code 0x%x)", status); + ALOGE("Framebuffer incomplete (GL error code 0x%x)", status); glBindFramebuffer(GL_FRAMEBUFFER, previousFbo); layer->deleteTexture(); @@ -569,7 +569,7 @@ bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, sp<Snapshot> sna */ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) { if (!current->layer) { - LOGE("Attempting to compose a layer that does not exist"); + ALOGE("Attempting to compose a layer that does not exist"); return; } |