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

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

More refactoring 

 Merge GlRenderer and Gl20Renderer
 Move GLRenderer to its own file
 Move native methods from HardwareRenderer to GLRenderer

Change-Id: Ib4680b03dd98101b2a428062cc94774ff73baa75
parent fe273728

core/java/android/view/DisplayList.java

+8 −11
Original line number Diff line number Diff line
@@ -86,9 +86,7 @@ import android.graphics.Matrix; 
 *

 * <pre class="prettyprint">

 *     private void createDisplayList() {

 *         HardwareRenderer renderer = getHardwareRenderer();

 *         if (renderer != null) {

 *             mDisplayList = renderer.createDisplayList();

 *         mDisplayList = DisplayList.create("MyDisplayList");

 *         HardwareCanvas canvas = mDisplayList.start(width, height);

 *         try {

 *             for (Bitmap b : mBitmaps) {
@@ -99,7 +97,6 @@ import android.graphics.Matrix; 
 *             displayList.end();

 *         }

 *     }

 *     }

 *

 *     protected void onDraw(Canvas canvas) {

 *         if (canvas.isHardwareAccelerated()) {

core/java/android/view/GLRenderer.java

0 → 100644
+1610 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/view/HardwareRenderer.java

+7 −1643

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/View.java

+0 −14
Original line number Diff line number Diff line
@@ -13357,20 +13357,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        return !(mAttachInfo == null || mAttachInfo.mHardwareRenderer == null);

    }













    /**













     * @return The {@link HardwareRenderer} associated with that view or null if













     *         hardware rendering is not supported or this view is not attached













     *         to a window.













     *













     * @hide













     */













    public HardwareRenderer getHardwareRenderer() {













        if (mAttachInfo != null) {













            return mAttachInfo.mHardwareRenderer;













        }













        return null;













    }



























    /**















     * Returns a DisplayList. If the incoming displayList is null, one will be created.















     * Otherwise, the same display list will be returned (after having been rendered into

































core/java/android/view/ViewRootImpl.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -718,7 +718,7 @@ public final class ViewRootImpl implements ViewParent,













                }































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













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













                mAttachInfo.mHardwareRenderer = HardwareRenderer.create(translucent);















                if (mAttachInfo.mHardwareRenderer != null) {















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















                    mAttachInfo.mHardwareAccelerated =