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

Commit 80e6d887 authored by Thomas Buhot's avatar Thomas Buhot Committed by Andriy Naborskyy
Browse files

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous 

from AOSP: https://android-review.googlesource.com/#/c/183305/



On the critical path of the cold launch of applications
the main thread of the started application tells the RenderThread
to create a surface. This process is synchronous and blocks
the main thread of the application until the creation
of the EGLContext is complete.
As a consequence the launch time of the application is delayed
by time spent allocating the EGL Context in the RenderThread.

With this optimization the launch time of any application
is improved (for example settings by 20 to 40 ms).

Change-Id: Ibf47aaa0abb8dedf7aa00693073db3785d9d6b08
Signed-off-by: default avatarThomas Buhot <thomas.buhot@intel.com>
Signed-off-by: default avatarZhiquan Liu <zhiquan.liu@intel.com>
parent 43222cec

core/java/android/view/ThreadedRenderer.java

+3 −2
Original line number Diff line number Diff line
@@ -145,9 +145,10 @@ public class ThreadedRenderer extends HardwareRenderer { 


    @Override

    boolean initialize(Surface surface) throws OutOfResourcesException {

        boolean status = !mInitialized;

        mInitialized = true;

        updateEnabledState(surface);

        boolean status = nInitialize(mNativeProxy, surface);

        nInitialize(mNativeProxy, surface);

        return status;

    }
@@ -503,7 +504,7 @@ public class ThreadedRenderer extends HardwareRenderer { 
    private static native boolean nLoadSystemProperties(long nativeProxy);

    private static native void nSetName(long nativeProxy, String name);



    private static native boolean nInitialize(long nativeProxy, Surface window);

    private static native void nInitialize(long nativeProxy, Surface window);

    private static native void nUpdateSurface(long nativeProxy, Surface window);

    private static native boolean nPauseSurface(long nativeProxy, Surface window);

    private static native void nSetup(long nativeProxy, int width, int height,

core/jni/android_view_ThreadedRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -262,11 +262,11 @@ static void android_view_ThreadedRenderer_setName(JNIEnv* env, jobject clazz, 
    env->ReleaseStringUTFChars(jname, name);

}



static jboolean android_view_ThreadedRenderer_initialize(JNIEnv* env, jobject clazz,

static void android_view_ThreadedRenderer_initialize(JNIEnv* env, jobject clazz,

        jlong proxyPtr, jobject jsurface) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    sp<ANativeWindow> window = android_view_Surface_getNativeWindow(env, jsurface);

    return proxy->initialize(window);

    proxy->initialize(window);

}



static void android_view_ThreadedRenderer_updateSurface(JNIEnv* env, jobject clazz,
@@ -461,7 +461,7 @@ static JNINativeMethod gMethods[] = { 
    { "nDeleteProxy", "(J)V", (void*) android_view_ThreadedRenderer_deleteProxy },

    { "nLoadSystemProperties", "(J)Z", (void*) android_view_ThreadedRenderer_loadSystemProperties },

    { "nSetName", "(JLjava/lang/String;)V", (void*) android_view_ThreadedRenderer_setName },

    { "nInitialize", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_initialize },

    { "nInitialize", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_initialize },

    { "nUpdateSurface", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_updateSurface },

    { "nPauseSurface", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_pauseSurface },

    { "nSetup", "(JIIFII)V", (void*) android_view_ThreadedRenderer_setup },

libs/hwui/renderthread/CanvasContext.cpp

+2 −3
Original line number Diff line number Diff line
@@ -110,12 +110,11 @@ void CanvasContext::setSwapBehavior(SwapBehavior swapBehavior) { 
    mSwapBehavior = swapBehavior;

}



bool CanvasContext::initialize(ANativeWindow* window) {

void CanvasContext::initialize(ANativeWindow* window) {

    setSurface(window);

    if (mCanvas) return false;

    if (mCanvas) return;

    mCanvas = new OpenGLRenderer(mRenderThread.renderState());

    mCanvas->initProperties();

    return true;

}



void CanvasContext::updateSurface(ANativeWindow* window) {

libs/hwui/renderthread/CanvasContext.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
    // Won't take effect until next EGLSurface creation

    void setSwapBehavior(SwapBehavior swapBehavior);



    bool initialize(ANativeWindow* window);

    void initialize(ANativeWindow* window);

    void updateSurface(ANativeWindow* window);

    bool pauseSurface(ANativeWindow* window);

    bool hasSurface() { return mNativeWindow.get(); }

libs/hwui/renderthread/RenderProxy.cpp

+4 −3
Original line number Diff line number Diff line
@@ -140,14 +140,15 @@ void RenderProxy::setName(const char* name) { 
}



CREATE_BRIDGE2(initialize, CanvasContext* context, ANativeWindow* window) {

    return (void*) args->context->initialize(args->window);

    args->context->initialize(args->window);

    return nullptr;

}



bool RenderProxy::initialize(const sp<ANativeWindow>& window) {

void RenderProxy::initialize(const sp<ANativeWindow>& window) {

    SETUP_TASK(initialize);

    args->context = mContext;

    args->window = window.get();

    return (bool) postAndWait(task);

    post(task);

}



CREATE_BRIDGE2(updateSurface, CanvasContext* context, ANativeWindow* window) {