Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev

Browse Source 
* commit 'f0f68117c432edd5aea406e773ec5bd372976eec':
  Trace some interesting events
This commit is contained in:
John Reck
2014-11-18 21:29:15 +00:00
committed by Android Git Automerger
parent 818b239d00 f0f68117c4
commit decc26df39
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/AssetAtlas.cpp
View File

@@ -33,6 +33,8 @@ void AssetAtlas::init(sp<GraphicBuffer> buffer, int64_t* map, int count) {
return; return;
} }
ATRACE_NAME("AssetAtlas::init");
mImage = new Image(buffer); mImage = new Image(buffer);
if (mImage->getTexture()) { if (mImage->getTexture()) {

2
libs/hwui/Caches.cpp
View File

@@ -66,6 +66,8 @@ Caches::Caches(): Singleton<Caches>(),
bool Caches::init() { bool Caches::init() {
if (mInitialized) return false; if (mInitialized) return false;
ATRACE_NAME("Caches::init");
glGenBuffers(1, &meshBuffer); glGenBuffers(1, &meshBuffer);
glBindBuffer(GL_ARRAY_BUFFER, meshBuffer); glBindBuffer(GL_ARRAY_BUFFER, meshBuffer);
glBufferData(GL_ARRAY_BUFFER, sizeof(gMeshVertices), gMeshVertices, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(gMeshVertices), gMeshVertices, GL_STATIC_DRAW);

2
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -71,6 +71,8 @@ void CanvasContext::destroy() {
} }
void CanvasContext::setSurface(ANativeWindow* window) { void CanvasContext::setSurface(ANativeWindow* window) {
ATRACE_CALL();
mNativeWindow = window; mNativeWindow = window;
if (mEglSurface != EGL_NO_SURFACE) { if (mEglSurface != EGL_NO_SURFACE) {

2
libs/hwui/renderthread/EglManager.cpp
View File

@@ -82,6 +82,8 @@ EglManager::EglManager(RenderThread& thread)
void EglManager::initialize() { void EglManager::initialize() {
if (hasEglContext()) return; if (hasEglContext()) return;
ATRACE_NAME("Creating EGLContext");
mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY, LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY,
"Failed to get EGL_DEFAULT_DISPLAY! err=%s", egl_error_str()); "Failed to get EGL_DEFAULT_DISPLAY! err=%s", egl_error_str());