diff options
author | Steve Block <steveblock@google.com> | 2012-01-05 23:22:43 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-06 10:07:54 +0000 |
commit | 32397c1cd3327905173b36baa6fd1c579bc328ff (patch) | |
tree | 6eec8d541334d19af13d46239d603d86f52eefd7 /opengl/libs/EGL | |
parent | 5f56dfec5aa6d9ff63c08112fb5d60efd813b549 (diff) | |
download | frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.zip frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.tar.gz frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.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 'opengl/libs/EGL')
-rw-r--r-- | opengl/libs/EGL/egl_cache.cpp | 4 | ||||
-rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 6 | ||||
-rw-r--r-- | opengl/libs/EGL/egl_object.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/opengl/libs/EGL/egl_cache.cpp b/opengl/libs/EGL/egl_cache.cpp index c4a7466..ae314b4 100644 --- a/opengl/libs/EGL/egl_cache.cpp +++ b/opengl/libs/EGL/egl_cache.cpp @@ -133,7 +133,7 @@ void egl_cache_t::setBlob(const void* key, EGLsizeiANDROID keySize, Mutex::Autolock lock(mMutex); if (keySize < 0 || valueSize < 0) { - LOGW("EGL_ANDROID_blob_cache set: negative sizes are not allowed"); + ALOGW("EGL_ANDROID_blob_cache set: negative sizes are not allowed"); return; } @@ -172,7 +172,7 @@ EGLsizeiANDROID egl_cache_t::getBlob(const void* key, EGLsizeiANDROID keySize, Mutex::Autolock lock(mMutex); if (keySize < 0 || valueSize < 0) { - LOGW("EGL_ANDROID_blob_cache set: negative sizes are not allowed"); + ALOGW("EGL_ANDROID_blob_cache set: negative sizes are not allowed"); return 0; } diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index ad5bdfc..53eaf9a 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -201,7 +201,7 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { EGL_CLIENT_APIS); } else { - LOGW("%d: eglInitialize(%p) failed (%s)", i, idpy, + ALOGW("%d: eglInitialize(%p) failed (%s)", i, idpy, egl_tls_t::egl_strerror(cnx->egl.eglGetError())); } } @@ -309,7 +309,7 @@ EGLBoolean egl_display_t::terminate() { egl_connection_t* const cnx = &gEGLImpl[i]; if (cnx->dso && disp[i].state == egl_display_t::INITIALIZED) { if (cnx->egl.eglTerminate(disp[i].dpy) == EGL_FALSE) { - LOGW("%d: eglTerminate(%p) failed (%s)", i, disp[i].dpy, + ALOGW("%d: eglTerminate(%p) failed (%s)", i, disp[i].dpy, egl_tls_t::egl_strerror(cnx->egl.eglGetError())); } // REVISIT: it's unclear what to do if eglTerminate() fails @@ -327,7 +327,7 @@ EGLBoolean egl_display_t::terminate() { // there are no reference to them, it which case, we're free to // delete them. size_t count = objects.size(); - LOGW_IF(count, "eglTerminate() called w/ %d objects remaining", count); + ALOGW_IF(count, "eglTerminate() called w/ %d objects remaining", count); for (size_t i=0 ; i<count ; i++) { egl_object_t* o = objects.itemAt(i); o->destroy(); diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h index df1b261..64737c8 100644 --- a/opengl/libs/EGL/egl_object.h +++ b/opengl/libs/EGL/egl_object.h @@ -131,7 +131,7 @@ protected: if (window != NULL) { native_window_set_buffers_format(window, 0); if (native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL)) { - LOGW("EGLNativeWindowType %p disconnect failed", window); + ALOGW("EGLNativeWindowType %p disconnect failed", window); } } } |