diff options
33 files changed, 22 insertions, 97 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 2db2132ed354..ad46f2b6df84 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -815,7 +815,7 @@ public final class ThreadedRenderer extends HardwareRenderer { int syncResult = syncAndDrawFrame(frameInfo); if ((syncResult & SYNC_LOST_SURFACE_REWARD_IF_FOUND) != 0) { - Log.w("OpenGLRenderer", "Surface lost, forcing relayout"); + Log.w("HWUI", "Surface lost, forcing relayout"); // We lost our surface. For a relayout next frame which should give us a new // surface from WindowManager, which hopefully will work. attachInfo.mViewRootImpl.mForceNextWindowRelayout = true; diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index b5e6f94af022..7f80dff311f5 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -44,7 +44,7 @@ cc_defaults { "-DEGL_EGLEXT_PROTOTYPES", "-DGL_GLEXT_PROTOTYPES", "-DATRACE_TAG=ATRACE_TAG_VIEW", - "-DLOG_TAG=\"OpenGLRenderer\"", + "-DLOG_TAG=\"HWUI\"", "-Wall", "-Wthread-safety", "-Wno-unused-parameter", diff --git a/libs/hwui/apex/android_bitmap.cpp b/libs/hwui/apex/android_bitmap.cpp index c442a7b1d17c..c80a9b4ae97f 100644 --- a/libs/hwui/apex/android_bitmap.cpp +++ b/libs/hwui/apex/android_bitmap.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "Bitmap" #include <log/log.h> #include "android/graphics/bitmap.h" diff --git a/libs/hwui/apex/jni_runtime.cpp b/libs/hwui/apex/jni_runtime.cpp index 09ae7e78fe23..883f273b5d3d 100644 --- a/libs/hwui/apex/jni_runtime.cpp +++ b/libs/hwui/apex/jni_runtime.cpp @@ -25,9 +25,6 @@ #include <sys/cdefs.h> #include <vulkan/vulkan.h> -#undef LOG_TAG -#define LOG_TAG "AndroidGraphicsJNI" - extern int register_android_graphics_Bitmap(JNIEnv*); extern int register_android_graphics_BitmapFactory(JNIEnv*); extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*); diff --git a/libs/hwui/hwui/ImageDecoder.cpp b/libs/hwui/hwui/ImageDecoder.cpp index 701a87f0cce4..588463c49497 100644 --- a/libs/hwui/hwui/ImageDecoder.cpp +++ b/libs/hwui/hwui/ImageDecoder.cpp @@ -43,9 +43,6 @@ #include <memory> -#undef LOG_TAG -#define LOG_TAG "ImageDecoder" - using namespace android; sk_sp<SkColorSpace> ImageDecoder::getDefaultColorSpace() const { diff --git a/libs/hwui/jni/Bitmap.cpp b/libs/hwui/jni/Bitmap.cpp index 6ee7576651f2..9e21f860ce21 100644 --- a/libs/hwui/jni/Bitmap.cpp +++ b/libs/hwui/jni/Bitmap.cpp @@ -1,5 +1,3 @@ -#undef LOG_TAG -#define LOG_TAG "Bitmap" // #define LOG_NDEBUG 0 #include "Bitmap.h" diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp index 8abcd9a59122..3d0a53440bfb 100644 --- a/libs/hwui/jni/BitmapFactory.cpp +++ b/libs/hwui/jni/BitmapFactory.cpp @@ -1,6 +1,3 @@ -#undef LOG_TAG -#define LOG_TAG "BitmapFactory" - #include "BitmapFactory.h" #include <Gainmap.h> diff --git a/libs/hwui/jni/BitmapRegionDecoder.cpp b/libs/hwui/jni/BitmapRegionDecoder.cpp index 740988f77270..ea5c14486ea4 100644 --- a/libs/hwui/jni/BitmapRegionDecoder.cpp +++ b/libs/hwui/jni/BitmapRegionDecoder.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "BitmapRegionDecoder" - #include "BitmapRegionDecoder.h" #include <HardwareBitmapUploader.h> diff --git a/libs/hwui/jni/FontFamily.cpp b/libs/hwui/jni/FontFamily.cpp index af1668fbd7dd..0c3af61fc089 100644 --- a/libs/hwui/jni/FontFamily.cpp +++ b/libs/hwui/jni/FontFamily.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "Minikin" - #include <nativehelper/ScopedPrimitiveArray.h> #include <nativehelper/ScopedUtfChars.h> #include "FontUtils.h" diff --git a/libs/hwui/jni/Graphics.cpp b/libs/hwui/jni/Graphics.cpp index 78b4f7b7654d..7cc48661619a 100644 --- a/libs/hwui/jni/Graphics.cpp +++ b/libs/hwui/jni/Graphics.cpp @@ -1,6 +1,3 @@ -#undef LOG_TAG -#define LOG_TAG "GraphicsJNI" - #include <assert.h> #include <unistd.h> diff --git a/libs/hwui/jni/GraphicsStatsService.cpp b/libs/hwui/jni/GraphicsStatsService.cpp index e32c9115483c..54369b9e4384 100644 --- a/libs/hwui/jni/GraphicsStatsService.cpp +++ b/libs/hwui/jni/GraphicsStatsService.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "GraphicsStatsService" - #include <JankTracker.h> #include <log/log.h> #include <nativehelper/ScopedPrimitiveArray.h> diff --git a/libs/hwui/jni/NinePatch.cpp b/libs/hwui/jni/NinePatch.cpp index d50a8a22b5cb..67ef143e6179 100644 --- a/libs/hwui/jni/NinePatch.cpp +++ b/libs/hwui/jni/NinePatch.cpp @@ -15,8 +15,6 @@ ** limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "9patch" #define LOG_NDEBUG 1 #include <androidfw/ResourceTypes.h> diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp index d2a4efe05219..1ba7f701a654 100644 --- a/libs/hwui/jni/Paint.cpp +++ b/libs/hwui/jni/Paint.cpp @@ -15,9 +15,6 @@ ** limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "Paint" - #include <hwui/BlurDrawLooper.h> #include <hwui/MinikinSkia.h> #include <hwui/MinikinUtils.h> diff --git a/libs/hwui/jni/Shader.cpp b/libs/hwui/jni/Shader.cpp index 7eb79be6f55b..2c13ceb77b52 100644 --- a/libs/hwui/jni/Shader.cpp +++ b/libs/hwui/jni/Shader.cpp @@ -1,6 +1,3 @@ -#undef LOG_TAG -#define LOG_TAG "ShaderJNI" - #include <vector> #include "Gainmap.h" diff --git a/libs/hwui/jni/YuvToJpegEncoder.cpp b/libs/hwui/jni/YuvToJpegEncoder.cpp index 69418b09fee6..4dbfa88d6301 100644 --- a/libs/hwui/jni/YuvToJpegEncoder.cpp +++ b/libs/hwui/jni/YuvToJpegEncoder.cpp @@ -1,6 +1,3 @@ -#undef LOG_TAG -#define LOG_TAG "YuvToJpegEncoder" - #include "CreateJavaOutputStreamAdaptor.h" #include "SkStream.h" #include "YuvToJpegEncoder.h" diff --git a/libs/hwui/jni/android_graphics_HardwareBufferRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareBufferRenderer.cpp index 706f18c3be80..e3cdee6e7034 100644 --- a/libs/hwui/jni/android_graphics_HardwareBufferRenderer.cpp +++ b/libs/hwui/jni/android_graphics_HardwareBufferRenderer.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "HardwareBufferRenderer" #define ATRACE_TAG ATRACE_TAG_VIEW #include <GraphicsJNI.h> diff --git a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp index ee22f7c6cf03..422ffeaecfd0 100644 --- a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp +++ b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "ThreadedRenderer" #define ATRACE_TAG ATRACE_TAG_VIEW #include <FrameInfo.h> diff --git a/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp b/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp index 764eff9a04be..b86c74fe0e47 100644 --- a/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp +++ b/libs/hwui/jni/android_graphics_animation_NativeInterpolatorFactory.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include <Interpolator.h> #include <cutils/log.h> diff --git a/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp b/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp index c6d26f853c1d..40be9243affb 100644 --- a/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp +++ b/libs/hwui/jni/android_graphics_animation_RenderNodeAnimator.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include <Animator.h> #include <Interpolator.h> #include <RenderProperties.h> diff --git a/libs/hwui/jni/fonts/Font.cpp b/libs/hwui/jni/fonts/Font.cpp index 8cfdeeb7e128..2ec94c954fe9 100644 --- a/libs/hwui/jni/fonts/Font.cpp +++ b/libs/hwui/jni/fonts/Font.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "Minikin" - #include "Font.h" #include "SkData.h" #include "SkFont.h" diff --git a/libs/hwui/jni/fonts/FontFamily.cpp b/libs/hwui/jni/fonts/FontFamily.cpp index 1e392b14728d..462c8c8f2fb0 100644 --- a/libs/hwui/jni/fonts/FontFamily.cpp +++ b/libs/hwui/jni/fonts/FontFamily.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "Minikin" - #include "graphics_jni_helpers.h" #include <nativehelper/ScopedUtfChars.h> diff --git a/libs/hwui/jni/pdf/PdfEditor.cpp b/libs/hwui/jni/pdf/PdfEditor.cpp index 427bafa1bd83..3b18f5f54187 100644 --- a/libs/hwui/jni/pdf/PdfEditor.cpp +++ b/libs/hwui/jni/pdf/PdfEditor.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "PdfEditor" - #include <sys/types.h> #include <unistd.h> diff --git a/libs/hwui/jni/pdf/PdfUtils.cpp b/libs/hwui/jni/pdf/PdfUtils.cpp index 06d202828b85..6887fdacd68f 100644 --- a/libs/hwui/jni/pdf/PdfUtils.cpp +++ b/libs/hwui/jni/pdf/PdfUtils.cpp @@ -16,14 +16,11 @@ #include "PdfUtils.h" -#include "jni.h" #include <nativehelper/JNIHelp.h> +#include <utils/Log.h> #include "fpdfview.h" - -#undef LOG_TAG -#define LOG_TAG "PdfUtils" -#include <utils/Log.h> +#include "jni.h" namespace android { diff --git a/libs/hwui/jni/text/GraphemeBreak.cpp b/libs/hwui/jni/text/GraphemeBreak.cpp index 55f03bd9f7b1..322af7e9f3ee 100644 --- a/libs/hwui/jni/text/GraphemeBreak.cpp +++ b/libs/hwui/jni/text/GraphemeBreak.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "GraphemeBreaker" - #include <minikin/GraphemeBreak.h> #include <nativehelper/ScopedPrimitiveArray.h> diff --git a/libs/hwui/jni/text/LineBreaker.cpp b/libs/hwui/jni/text/LineBreaker.cpp index 69865171a09d..9ebf23c2ca6d 100644 --- a/libs/hwui/jni/text/LineBreaker.cpp +++ b/libs/hwui/jni/text/LineBreaker.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "LineBreaker" - #include "utils/misc.h" #include "utils/Log.h" #include "graphics_jni_helpers.h" diff --git a/libs/hwui/jni/text/MeasuredText.cpp b/libs/hwui/jni/text/MeasuredText.cpp index c13c800651ef..081713a5b56e 100644 --- a/libs/hwui/jni/text/MeasuredText.cpp +++ b/libs/hwui/jni/text/MeasuredText.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "MeasuredText" - #include "GraphicsJNI.h" #include "utils/misc.h" #include "utils/Log.h" diff --git a/libs/hwui/jni/text/TextShaper.cpp b/libs/hwui/jni/text/TextShaper.cpp index 8c377b9f1829..6c05346d26da 100644 --- a/libs/hwui/jni/text/TextShaper.cpp +++ b/libs/hwui/jni/text/TextShaper.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#undef LOG_TAG -#define LOG_TAG "TextShaper" - #include "graphics_jni_helpers.h" #include <nativehelper/ScopedStringChars.h> #include <nativehelper/ScopedPrimitiveArray.h> diff --git a/libs/hwui/private/hwui/DrawGlInfo.h b/libs/hwui/private/hwui/DrawGlInfo.h index eb1f9304a5c8..ed3fabc61708 100644 --- a/libs/hwui/private/hwui/DrawGlInfo.h +++ b/libs/hwui/private/hwui/DrawGlInfo.h @@ -24,8 +24,7 @@ namespace android { namespace uirenderer { /** - * Structure used by OpenGLRenderer::callDrawGLFunction() to pass and - * receive data from OpenGL functors. + * Structure used to pass and receive data from OpenGL functors. */ struct DrawGlInfo { // Input: current clip rect diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index f3409455d401..a6e8c08ffbe8 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -34,9 +34,6 @@ #include "pipeline/skia/ShaderCache.h" #include "renderstate/RenderState.h" -#undef LOG_TAG -#define LOG_TAG "VulkanManager" - namespace android { namespace uirenderer { namespace renderthread { diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index b0ba619c63a4..20b743bab2c2 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -25,9 +25,6 @@ #include "VulkanManager.h" #include "utils/Color.h" -#undef LOG_TAG -#define LOG_TAG "VulkanSurface" - namespace android { namespace uirenderer { namespace renderthread { diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/BitmapsAlphaActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/BitmapsAlphaActivity.java index ef49c7fd00a9..cb16191423ce 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/BitmapsAlphaActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/BitmapsAlphaActivity.java @@ -48,15 +48,15 @@ public class BitmapsAlphaActivity extends Activity { BitmapsView(Context c) { super(c); - Log.d("OpenGLRenderer", "Loading sunset1, default options"); + Log.d("HWUI", "Loading sunset1, default options"); mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1); - Log.d("OpenGLRenderer", "Loading sunset2, default options"); + Log.d("HWUI", "Loading sunset2, default options"); mBitmap2 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset2); - Log.d("OpenGLRenderer", "Loading sunset3, forcing ARGB-8888"); + Log.d("HWUI", "Loading sunset3, forcing ARGB-8888"); BitmapFactory.Options opts = new BitmapFactory.Options(); opts.inPreferredConfig = Bitmap.Config.ARGB_8888; mBitmap3 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset3, opts); - Log.d("OpenGLRenderer", " has bitmap alpha? " + mBitmap3.hasAlpha()); + Log.d("HWUI", " has bitmap alpha? " + mBitmap3.hasAlpha()); mBitmapPaint = new Paint(); } @@ -65,7 +65,7 @@ public class BitmapsAlphaActivity extends Activity { protected void onDraw(Canvas canvas) { super.onDraw(canvas); - Log.d("OpenGLRenderer", "================= Draw"); + Log.d("HWUI", "================= Draw"); canvas.translate(120.0f, 50.0f); canvas.drawBitmap(mBitmap1, 0.0f, 0.0f, mBitmapPaint); diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java index 1c82e9bbdf9b..dbfb4ca7c8fe 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java @@ -77,7 +77,7 @@ public class ClearActivity extends Activity { canvas.drawPath(mPath, mClearPaint); } canvas.restore(); - canvas.drawText("OpenGLRenderer", 50.0f, 50.0f, mClearPaint); + canvas.drawText("HWUI", 50.0f, 50.0f, mClearPaint); mClearPaint.setColor(0xff000000); canvas.drawRect(800.0f, 100.0f, 900.0f, 200.0f, mClearPaint); mClearPaint.setColor(0x0000ff00); diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/QuickRejectActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/QuickRejectActivity.java index 5192bfe84fef..11a2a4161a8b 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/QuickRejectActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/QuickRejectActivity.java @@ -53,30 +53,30 @@ public class QuickRejectActivity extends Activity { super.onDraw(canvas); int count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "count=" + count); + Log.d("HWUI", "count=" + count); count = canvas.save(); - Log.d("OpenGLRenderer", "count after save=" + count); + Log.d("HWUI", "count after save=" + count); count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "getSaveCount after save=" + count); + Log.d("HWUI", "getSaveCount after save=" + count); canvas.restore(); count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "count after restore=" + count); + Log.d("HWUI", "count after restore=" + count); canvas.save(); - Log.d("OpenGLRenderer", "count after save=" + canvas.getSaveCount()); + Log.d("HWUI", "count after save=" + canvas.getSaveCount()); canvas.save(); - Log.d("OpenGLRenderer", "count after save=" + canvas.getSaveCount()); + Log.d("HWUI", "count after save=" + canvas.getSaveCount()); canvas.save(); - Log.d("OpenGLRenderer", "count after save=" + canvas.getSaveCount()); + Log.d("HWUI", "count after save=" + canvas.getSaveCount()); canvas.restoreToCount(count); count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "count after restoreToCount=" + count); + Log.d("HWUI", "count after restoreToCount=" + count); count = canvas.saveLayer(0, 0, 10, 10, mBitmapPaint, Canvas.ALL_SAVE_FLAG); - Log.d("OpenGLRenderer", "count after saveLayer=" + count); + Log.d("HWUI", "count after saveLayer=" + count); count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "getSaveCount after saveLayer=" + count); + Log.d("HWUI", "getSaveCount after saveLayer=" + count); canvas.restore(); count = canvas.getSaveCount(); - Log.d("OpenGLRenderer", "count after restore=" + count); + Log.d("HWUI", "count after restore=" + count); canvas.save(); canvas.clipRect(0.0f, 0.0f, 40.0f, 40.0f); |