Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27eaec23 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

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

* commit '842697a3':
  Trace some interesting events
parents bee20cb5 842697a3

libs/hwui/AssetAtlas.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,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()) {

libs/hwui/Caches.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,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);

libs/hwui/renderthread/CanvasContext.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -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) {

libs/hwui/renderthread/EglManager.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,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());