From bdb801ca993bcccbf2a4c2401d1720c3fa523777 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 4 Oct 2010 17:22:29 -0700 Subject: [PATCH] Remove logs to reduce logcat spam. Change-Id: I5fc295b05b5d82bb86827b88e94dd51e8bcdc7d3 --- core/jni/android_view_GLES20Canvas.cpp | 17 ++++++++++++++++- libs/hwui/OpenGLRenderer.cpp | 3 --- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index cb1556b17ede7..7521af4628479 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -50,7 +50,20 @@ using namespace uirenderer; */ #ifdef USE_OPENGL_RENDERER +/////////////////////////////////////////////////////////////////////////////// +// Defines +/////////////////////////////////////////////////////////////////////////////// + +// Debug #define DEBUG_RENDERER 0 +#define PROFILE_RENDERER 0 + +// Debug +#if DEBUG_RENDERER + #define RENDERER_LOGD(...) LOGD(__VA_ARGS__) +#else + #define RENDERER_LOGD(...) +#endif // ---------------------------------------------------------------------------- // Java APIs @@ -66,7 +79,8 @@ static struct { // ---------------------------------------------------------------------------- static OpenGLRenderer* android_view_GLES20Canvas_createRenderer(JNIEnv* env, jobject canvas) { -#if DEBUG_RENDERER + RENDERER_LOGD("Create OpenGLRenderer"); +#if PROFILE_RENDERER return new OpenGLDebugRenderer; #else return new OpenGLRenderer; @@ -75,6 +89,7 @@ static OpenGLRenderer* android_view_GLES20Canvas_createRenderer(JNIEnv* env, job static void android_view_GLES20Canvas_destroyRenderer(JNIEnv* env, jobject canvas, OpenGLRenderer* renderer) { + RENDERER_LOGD("Destroy OpenGLRenderer"); delete renderer; } diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 81d36e985d983..e3790f5cab75f 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -113,8 +113,6 @@ static const GLenum gTextureUnits[] = { /////////////////////////////////////////////////////////////////////////////// OpenGLRenderer::OpenGLRenderer(): mCaches(Caches::getInstance()) { - LOGD("Create OpenGLRenderer"); - mShader = NULL; mColorFilter = NULL; mHasShadow = false; @@ -133,7 +131,6 @@ OpenGLRenderer::OpenGLRenderer(): mCaches(Caches::getInstance()) { } OpenGLRenderer::~OpenGLRenderer() { - LOGD("Destroy OpenGLRenderer"); // The context has already been destroyed at this point, do not call // GL APIs. All GL state should be kept in Caches.h }