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

Commit bfb07a03 authored by John Reck's avatar John Reck
Browse files

Move where updateProperties is called 

Change-Id: I27da448996019094c44487ce28c5689d098d6535
parent 41c2d2ce

core/java/android/view/GLRenderer.java

+3 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,7 @@ public class GLRenderer extends HardwareRenderer { 
        }



        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "drawDisplayList");

        nUpdateRenderNodeProperties(displayList.getNativeDisplayList());

        try {

            status |= canvas.drawDisplayList(displayList, mRedrawClip,

                    RenderNode.FLAG_CLIP_CHILDREN);
@@ -1466,6 +1467,8 @@ public class GLRenderer extends HardwareRenderer { 


    static native void nDestroyLayer(long layerPtr);



    private static native void nUpdateRenderNodeProperties(long displayListPtr);



    class DrawPerformanceDataProvider extends GraphDataProvider {

        private final int mGraphType;

core/jni/android_view_GLRenderer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ static void android_view_GLRenderer_setDisplayListData(JNIEnv* env, jobject claz 
    displayList->setData(newData);

}



static void android_view_GLRenderer_updateRenderNodeProperties(JNIEnv* env, jobject clazz,

        jlong renderNodePtr) {

    using namespace android::uirenderer;

    RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr);

    renderNode->updateProperties();

}



#endif // USE_OPENGL_RENDERER



// ----------------------------------------------------------------------------
@@ -179,6 +186,7 @@ static JNINativeMethod gMethods[] = { 
    { "getSystemTime",         "()J",   (void*) android_view_GLRenderer_getSystemTime },

    { "nDestroyLayer",         "(J)V",  (void*) android_view_GLRenderer_destroyLayer },

    { "nSetDisplayListData",  "(JJ)V", (void*) android_view_GLRenderer_setDisplayListData },

    { "nUpdateRenderNodeProperties", "(J)V", (void*) android_view_GLRenderer_updateRenderNodeProperties },

#endif



    { "setupShadersDiskCache", "(Ljava/lang/String;)V",

libs/hwui/DeferredLayerUpdater.cpp

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ bool DeferredLayerUpdater::apply() { 
            success = LayerRenderer::resizeLayer(mLayer, mWidth, mHeight);

        }

        mLayer->setBlend(mBlend);

        mDisplayList->updateProperties();

        mLayer->updateDeferred(mRenderer, mDisplayList,

                mDirtyRect.left, mDirtyRect.top, mDirtyRect.right, mDirtyRect.bottom);

        mDirtyRect.setEmpty();

libs/hwui/Layer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ void Layer::defer() { 
    renderer->setupFrameState(dirtyRect.left, dirtyRect.top,

            dirtyRect.right, dirtyRect.bottom, !isBlend());



    displayList->updateProperties();

    displayList->computeOrdering();

    displayList->defer(deferredState, 0);

libs/hwui/OpenGLRenderer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,6 @@ status_t OpenGLRenderer::drawDisplayList(RenderNode* displayList, Rect& dirty, 
    // will be performed by the display list itself

    if (displayList && displayList->isRenderable()) {

        // compute 3d ordering

        displayList->updateProperties();

        displayList->computeOrdering();

        if (CC_UNLIKELY(mCaches.drawDeferDisabled)) {

            status = startFrame();