From 01dda204cd28fe181691b4a44a51be7e5666d0c8 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 6 Jan 2012 14:13:42 +0000 Subject: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE Bug: 5449033 Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c --- libpixelflinger/codeflinger/CodeCache.cpp | 2 +- libpixelflinger/codeflinger/GGLAssembler.cpp | 4 ++-- libpixelflinger/codeflinger/blending.cpp | 4 ++-- libpixelflinger/codeflinger/load_store.cpp | 2 +- libpixelflinger/codeflinger/texturing.cpp | 2 +- libpixelflinger/scanline.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libpixelflinger') diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp index 125c3ce..a713feb 100644 --- a/libpixelflinger/codeflinger/CodeCache.cpp +++ b/libpixelflinger/codeflinger/CodeCache.cpp @@ -159,7 +159,7 @@ int CodeCache::cache( const AssemblyKeyBase& keyBase, const long base = long(assembly->base()); const long curr = base + long(assembly->size()); err = cacheflush(base, curr, 0); - LOGE_IF(err, "__ARM_NR_cacheflush error %s\n", + ALOGE_IF(err, "__ARM_NR_cacheflush error %s\n", strerror(errno)); #endif } diff --git a/libpixelflinger/codeflinger/GGLAssembler.cpp b/libpixelflinger/codeflinger/GGLAssembler.cpp index 1cd189c..f1d81b2 100644 --- a/libpixelflinger/codeflinger/GGLAssembler.cpp +++ b/libpixelflinger/codeflinger/GGLAssembler.cpp @@ -82,7 +82,7 @@ int GGLAssembler::scanline(const needs_t& needs, context_t const* c) needs.p, needs.n, needs.t[0], needs.t[1], per_fragment_ops); if (err) { - LOGE("Error while generating ""%s""\n", name); + ALOGE("Error while generating ""%s""\n", name); disassemble(name); return -1; } @@ -1095,7 +1095,7 @@ int RegisterAllocator::RegisterFile::obtain() } // this is not an error anymore because, we'll try again with // a lower optimization level. - //LOGE_IF(i >= nbreg, "pixelflinger ran out of registers\n"); + //ALOGE_IF(i >= nbreg, "pixelflinger ran out of registers\n"); if (i >= nbreg) { mStatus |= OUT_OF_REGISTERS; // we return SP so we can more easily debug things diff --git a/libpixelflinger/codeflinger/blending.cpp b/libpixelflinger/codeflinger/blending.cpp index 083042c..c90eaa0 100644 --- a/libpixelflinger/codeflinger/blending.cpp +++ b/libpixelflinger/codeflinger/blending.cpp @@ -536,7 +536,7 @@ void GGLAssembler::mul_factor( component_t& d, } } - LOGE_IF(ms>=32, "mul_factor overflow vs=%d, fs=%d", vs, fs); + ALOGE_IF(ms>=32, "mul_factor overflow vs=%d, fs=%d", vs, fs); int vreg = v.reg; int freg = f.reg; @@ -574,7 +574,7 @@ void GGLAssembler::mul_factor_add( component_t& d, int as = a.h; int ms = vs+fs; - LOGE_IF(ms>=32, "mul_factor_add overflow vs=%d, fs=%d, as=%d", vs, fs, as); + ALOGE_IF(ms>=32, "mul_factor_add overflow vs=%d, fs=%d, as=%d", vs, fs, as); integer_t add(a.reg, a.h, a.flags); diff --git a/libpixelflinger/codeflinger/load_store.cpp b/libpixelflinger/codeflinger/load_store.cpp index ed20a00..62aa05c 100644 --- a/libpixelflinger/codeflinger/load_store.cpp +++ b/libpixelflinger/codeflinger/load_store.cpp @@ -257,7 +257,7 @@ void GGLAssembler::downshift( int dbits = dh - dl; int dithering = 0; - LOGE_IF(sbitsdbits) { // see if we need to dither diff --git a/libpixelflinger/codeflinger/texturing.cpp b/libpixelflinger/codeflinger/texturing.cpp index 7f6f8da..8464fbd 100644 --- a/libpixelflinger/codeflinger/texturing.cpp +++ b/libpixelflinger/codeflinger/texturing.cpp @@ -778,7 +778,7 @@ void GGLAssembler::filter16( break; default: // unsupported format, do something sensical... - LOGE("Unsupported 16-bits texture format (%d)", tmu.format_idx); + ALOGE("Unsupported 16-bits texture format (%d)", tmu.format_idx); LDRH(AL, texel.reg, txPtr.reg); return; } diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index 6c55379..93440f5 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -381,7 +381,7 @@ static void pick_scanline(context_t* c) err = gCodeCache.cache(a->key(), a); } if (ggl_unlikely(err)) { - LOGE("error generating or caching assembly. Reverting to NOP."); + ALOGE("error generating or caching assembly. Reverting to NOP."); c->scanline = scanline_noop; c->init_y = init_y_noop; c->step_y = step_y__nop; @@ -1761,7 +1761,7 @@ void init_y_error(context_t* c, int32_t y0) // woooops, shoud never happen, // fail gracefully (don't display anything) init_y_noop(c, y0); - LOGE("color-buffer has an invalid format!"); + ALOGE("color-buffer has an invalid format!"); } // ---------------------------------------------------------------------------- -- cgit v1.1