diff options
| author | John Reck <jreck@google.com> | 2014-11-18 21:37:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 21:37:59 +0000 |
| commit | 27eaec23881f9564f98b484765d000822de5fdc3 (patch) | |
| tree | 2b958bb768b18ec0cff74e3b1e5949ba3b81f30b /libs/hwui/renderthread | |
| parent | bee20cb560d37d23f2037c210152f9c44246ba8d (diff) | |
| parent | 842697a3602204036e991cfea8b74da3df6e7f14 (diff) | |
| download | frameworks_base-27eaec23881f9564f98b484765d000822de5fdc3.zip frameworks_base-27eaec23881f9564f98b484765d000822de5fdc3.tar.gz frameworks_base-27eaec23881f9564f98b484765d000822de5fdc3.tar.bz2 | |
am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
* commit '842697a3602204036e991cfea8b74da3df6e7f14':
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 8299855..ee629c0 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 e49863d..f93da69 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -83,6 +83,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()); |