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

Commit e55945e2 authored by Romain Guy's avatar Romain Guy
Browse files

Reduce the size of dirty invalidates 

Remove remnants from times long gone. We don't need to redraw the
union of the previous frame's dirty region and the new dirty
region.

Change-Id: I9fb96f99a6a72c2233f9ca563cf6432a42b2b65b
parent 964a6a7e

core/java/android/view/HardwareRenderer.java

+3 −12
Original line number Diff line number Diff line
@@ -451,10 +451,8 @@ public abstract class HardwareRenderer { 
     * @param attachInfo AttachInfo tied to the specified view.

     * @param callbacks Callbacks invoked when drawing happens.

     * @param dirty The dirty rectangle to update, can be null.

     * 

     * @return true if the dirty rect was ignored, false otherwise

     */

    abstract boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,

    abstract void draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,

            Rect dirty);



    /**
@@ -992,11 +990,7 @@ public abstract class HardwareRenderer { 
                            mCanvas = createCanvas();

                            mCanvas.setName(mName);

                        }

                        if (mCanvas != null) {

                        setEnabled(true);

                        } else {

                            Log.w(LOG_TAG, "Hardware accelerated Canvas could not be created");

                        }

                    }



                    return mCanvas != null;
@@ -1340,7 +1334,7 @@ public abstract class HardwareRenderer { 
        }



        @Override

        boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,

        void draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,

                Rect dirty) {

            if (canDraw()) {

                if (!hasDirtyRegions()) {
@@ -1401,11 +1395,8 @@ public abstract class HardwareRenderer { 
                    }



                    attachInfo.mIgnoreDirtyState = false;

                    return dirty == null;

                }

            }



            return false;

        }



        private DisplayList buildDisplayList(View view, HardwareCanvas canvas) {

core/java/android/view/ViewRootImpl.java

+10 −13
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ public final class ViewRootImpl implements ViewParent, 
    int mHeight;

    Rect mDirty;

    final Rect mCurrentDirty = new Rect();

    final Rect mPreviousDirty = new Rect();

    boolean mIsAnimating;



    CompatibilityInfo.Translator mTranslator;
@@ -767,10 +766,11 @@ public final class ViewRootImpl implements ViewParent, 


                final boolean translucent = attrs.format != PixelFormat.OPAQUE;

                mAttachInfo.mHardwareRenderer = HardwareRenderer.createGlRenderer(2, translucent);

                if (mAttachInfo.mHardwareRenderer != null) {

                    mAttachInfo.mHardwareRenderer.setName(attrs.getTitle().toString());

                mAttachInfo.mHardwareAccelerated = mAttachInfo.mHardwareAccelerationRequested

                        = mAttachInfo.mHardwareRenderer != null;



                    mAttachInfo.mHardwareAccelerated =

                            mAttachInfo.mHardwareAccelerationRequested = true;

                }

            } else if (fakeHwAccelerated) {

                // The window had wanted to use hardware acceleration, but this

                // is not allowed in its process.  By setting this flag, it can
@@ -2385,14 +2385,10 @@ public final class ViewRootImpl implements ViewParent, 
                mResizeAlpha = resizeAlpha;



                mCurrentDirty.set(dirty);

                mCurrentDirty.union(mPreviousDirty);

                mPreviousDirty.set(dirty);

                dirty.setEmpty();



                if (attachInfo.mHardwareRenderer.draw(mView, attachInfo, this,

                        animating ? null : mCurrentDirty)) {

                    mPreviousDirty.set(0, 0, mWidth, mHeight);

                }

                attachInfo.mHardwareRenderer.draw(mView, attachInfo, this,

                        animating ? null : mCurrentDirty);

            } else {

                // If we get here with a disabled & requested hardware renderer, something went

                // wrong (an invalidate posted right before we destroyed the hardware surface
@@ -2447,6 +2443,8 @@ public final class ViewRootImpl implements ViewParent, 


            canvas = mSurface.lockCanvas(dirty);



            // The dirty rectangle can be modified by Surface.lockCanvas()

            //noinspection ConstantConditions

            if (left != dirty.left || top != dirty.top || right != dirty.right ||

                    bottom != dirty.bottom) {

                attachInfo.mIgnoreDirtyState = true;
@@ -3097,8 +3095,7 @@ public final class ViewRootImpl implements ViewParent, 
                        boolean inTouchMode = msg.arg2 != 0;

                        ensureTouchModeLocally(inTouchMode);



                        if (mAttachInfo.mHardwareRenderer != null &&

                                mSurface != null && mSurface.isValid()) {

                        if (mAttachInfo.mHardwareRenderer != null && mSurface.isValid()){

                            mFullRedrawNeeded = true;

                            try {

                                mAttachInfo.mHardwareRenderer.initializeIfNeeded(