diff options
| author | John Reck <jreck@google.com> | 2014-11-18 21:33:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 21:33:19 +0000 |
| commit | 842697a3602204036e991cfea8b74da3df6e7f14 (patch) | |
| tree | 6143113b63f3e52f443b6247a0611cb0c41042c1 /libs/hwui/renderthread | |
| parent | 1ec9c526c1d45161887faf353f4dc36b582be813 (diff) | |
| parent | decc26df39b734ca1cbaccda1cbe3b355eba6898 (diff) | |
| download | frameworks_base-842697a3602204036e991cfea8b74da3df6e7f14.zip frameworks_base-842697a3602204036e991cfea8b74da3df6e7f14.tar.gz frameworks_base-842697a3602204036e991cfea8b74da3df6e7f14.tar.bz2 | |
am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
* commit 'decc26df39b734ca1cbaccda1cbe3b355eba6898':
Trace some interesting events
Diffstat (limited to 'libs/hwui/renderthread')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 6c3637d..39528be 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -71,6 +71,8 @@ void CanvasContext::destroy() { } void CanvasContext::setSurface(ANativeWindow* window) { + ATRACE_CALL(); + mNativeWindow = window; if (mEglSurface != EGL_NO_SURFACE) { diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 9bd6f41..378cf61 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -82,6 +82,8 @@ EglManager::EglManager(RenderThread& thread) void EglManager::initialize() { if (hasEglContext()) return; + ATRACE_NAME("Creating EGLContext"); + mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY, "Failed to get EGL_DEFAULT_DISPLAY! err=%s", egl_error_str()); |