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

Commit 36bef0bf authored by Ashok Bhat's avatar Ashok Bhat Committed by Narayan Kamath
Browse files

AArch64: Make graphics classes 64-bit compatible 



This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
    be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
    yet. Specifically mAtlasMap member has to be converted
    to hold native pointer using long. Added a TODO to
    AssetAtlasManager.java to indicate the change required.

Signed-off-by: default avatarAshok Bhat <ashok.bhat@arm.com>
Signed-off-by: default avatarCraig Barber <craig.barber@arm.com>
Signed-off-by: default avatarKévin PETIT <kevin.petit@arm.com>
Signed-off-by: default avatarMarcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: default avatarAshok Bhat <ashok.bhat@arm.com>
Signed-off-by: default avatarMarcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
parent 729b12c7

core/java/android/view/DisplayList.java

+54 −54
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class DisplayList { 
        return mValid && mFinalizer != null;

    }



    int getNativeDisplayList() {

    long getNativeDisplayList() {

        if (!mValid || mFinalizer == null) {

            throw new IllegalStateException("The display list is not valid.");

        }
@@ -1029,73 +1029,73 @@ public class DisplayList { 
    // Native methods

    ///////////////////////////////////////////////////////////////////////////



    private static native void nDestroyDisplayList(int displayList);

    private static native int nGetDisplayListSize(int displayList);

    private static native void nSetDisplayListName(int displayList, String name);

    private static native void nDestroyDisplayList(long displayList);

    private static native int nGetDisplayListSize(long displayList);

    private static native void nSetDisplayListName(long displayList, String name);



    // Properties



    private static native void nReset(int displayList);

    private static native void nOffsetTopAndBottom(int displayList, float offset);

    private static native void nOffsetLeftAndRight(int displayList, float offset);

    private static native void nSetLeftTopRightBottom(int displayList, int left, int top,

    private static native void nReset(long displayList);

    private static native void nOffsetTopAndBottom(long displayList, float offset);

    private static native void nOffsetLeftAndRight(long displayList, float offset);

    private static native void nSetLeftTopRightBottom(long displayList, int left, int top,

            int right, int bottom);

    private static native void nSetBottom(int displayList, int bottom);

    private static native void nSetRight(int displayList, int right);

    private static native void nSetTop(int displayList, int top);

    private static native void nSetLeft(int displayList, int left);

    private static native void nSetCameraDistance(int displayList, float distance);

    private static native void nSetPivotY(int displayList, float pivotY);

    private static native void nSetPivotX(int displayList, float pivotX);

    private static native void nSetCaching(int displayList, boolean caching);

    private static native void nSetClipToBounds(int displayList, boolean clipToBounds);

    private static native void nSetProjectToContainedVolume(int displayList, boolean shouldProject);

    private static native void nSetIsContainedVolume(int displayList, boolean isContainedVolume);

    private static native void nSetAlpha(int displayList, float alpha);

    private static native void nSetHasOverlappingRendering(int displayList,

    private static native void nSetBottom(long displayList, int bottom);

    private static native void nSetRight(long displayList, int right);

    private static native void nSetTop(long displayList, int top);

    private static native void nSetLeft(long displayList, int left);

    private static native void nSetCameraDistance(long displayList, float distance);

    private static native void nSetPivotY(long displayList, float pivotY);

    private static native void nSetPivotX(long displayList, float pivotX);

    private static native void nSetCaching(long displayList, boolean caching);

    private static native void nSetClipToBounds(long displayList, boolean clipToBounds);

    private static native void nSetProjectToContainedVolume(long displayList, boolean shouldProject);

    private static native void nSetIsContainedVolume(long displayList, boolean isContainedVolume);

    private static native void nSetAlpha(long displayList, float alpha);

    private static native void nSetHasOverlappingRendering(long displayList,

            boolean hasOverlappingRendering);

    private static native void nSetTranslationX(int displayList, float translationX);

    private static native void nSetTranslationY(int displayList, float translationY);

    private static native void nSetTranslationZ(int displayList, float translationZ);

    private static native void nSetRotation(int displayList, float rotation);

    private static native void nSetRotationX(int displayList, float rotationX);

    private static native void nSetRotationY(int displayList, float rotationY);

    private static native void nSetScaleX(int displayList, float scaleX);

    private static native void nSetScaleY(int displayList, float scaleY);

    private static native void nSetTransformationInfo(int displayList, float alpha,

    private static native void nSetTranslationX(long displayList, float translationX);

    private static native void nSetTranslationY(long displayList, float translationY);

    private static native void nSetTranslationZ(long displayList, float translationZ);

    private static native void nSetRotation(long displayList, float rotation);

    private static native void nSetRotationX(long displayList, float rotationX);

    private static native void nSetRotationY(long displayList, float rotationY);

    private static native void nSetScaleX(long displayList, float scaleX);

    private static native void nSetScaleY(long displayList, float scaleY);

    private static native void nSetTransformationInfo(long displayList, float alpha,

            float translationX, float translationY, float translationZ,

            float rotation, float rotationX, float rotationY, float scaleX, float scaleY);

    private static native void nSetStaticMatrix(int displayList, int nativeMatrix);

    private static native void nSetAnimationMatrix(int displayList, int animationMatrix);



    private static native boolean nHasOverlappingRendering(int displayList);

    private static native void nGetMatrix(int displayList, int matrix);

    private static native float nGetAlpha(int displayList);

    private static native float nGetLeft(int displayList);

    private static native float nGetTop(int displayList);

    private static native float nGetRight(int displayList);

    private static native float nGetBottom(int displayList);

    private static native float nGetCameraDistance(int displayList);

    private static native float nGetScaleX(int displayList);

    private static native float nGetScaleY(int displayList);

    private static native float nGetTranslationX(int displayList);

    private static native float nGetTranslationY(int displayList);

    private static native float nGetTranslationZ(int displayList);

    private static native float nGetRotation(int displayList);

    private static native float nGetRotationX(int displayList);

    private static native float nGetRotationY(int displayList);

    private static native float nGetPivotX(int displayList);

    private static native float nGetPivotY(int displayList);

    private static native void nOutput(int displayList);

    private static native void nSetStaticMatrix(long displayList, long nativeMatrix);

    private static native void nSetAnimationMatrix(long displayList, long animationMatrix);



    private static native boolean nHasOverlappingRendering(long displayList);

    private static native void nGetMatrix(long displayList, long matrix);

    private static native float nGetAlpha(long displayList);

    private static native float nGetLeft(long displayList);

    private static native float nGetTop(long displayList);

    private static native float nGetRight(long displayList);

    private static native float nGetBottom(long displayList);

    private static native float nGetCameraDistance(long displayList);

    private static native float nGetScaleX(long displayList);

    private static native float nGetScaleY(long displayList);

    private static native float nGetTranslationX(long displayList);

    private static native float nGetTranslationY(long displayList);

    private static native float nGetTranslationZ(long displayList);

    private static native float nGetRotation(long displayList);

    private static native float nGetRotationX(long displayList);

    private static native float nGetRotationY(long displayList);

    private static native float nGetPivotX(long displayList);

    private static native float nGetPivotY(long displayList);

    private static native void nOutput(long displayList);



    ///////////////////////////////////////////////////////////////////////////

    // Finalization

    ///////////////////////////////////////////////////////////////////////////



    private static class DisplayListFinalizer {

        final int mNativeDisplayList;

        final long mNativeDisplayList;



        public DisplayListFinalizer(int nativeDisplayList) {

        public DisplayListFinalizer(long nativeDisplayList) {

            mNativeDisplayList = nativeDisplayList;

        }

core/java/android/view/GLES20Canvas.java

+130 −130

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/GLES20Layer.java

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.graphics.Paint; 
 * An OpenGL ES 2.0 implementation of {@link HardwareLayer}.

 */

abstract class GLES20Layer extends HardwareLayer {

    int mLayer;

    long mLayer;

    Finalizer mFinalizer;



    GLES20Layer() {
@@ -39,7 +39,7 @@ abstract class GLES20Layer extends HardwareLayer { 
     * 

     * @return A pointer to the native layer object, or 0 if the object is NULL

     */

    public int getLayer() {

    public long getLayer() {

        return mLayer;

    }
@@ -75,9 +75,9 @@ abstract class GLES20Layer extends HardwareLayer { 
    }



    static class Finalizer {

        private int mLayerId;

        private long mLayerId;



        public Finalizer(int layerId) {

        public Finalizer(long layerId) {

            mLayerId = layerId;

        }

core/java/android/view/GLES20RecordingCanvas.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class GLES20RecordingCanvas extends GLES20Canvas { 
        mDisplayList.clearReferences();

    }



    int end(int nativeDisplayList) {

    long end(long nativeDisplayList) {

        return getDisplayList(nativeDisplayList);

    }

core/java/android/view/GLRenderer.java

+2 −2
Original line number Diff line number Diff line
@@ -1406,14 +1406,14 @@ public class GLRenderer extends HardwareRenderer { 
    }



    @Override

    void detachFunctor(int functor) {

    void detachFunctor(long functor) {

        if (mCanvas != null) {

            mCanvas.detachFunctor(functor);

        }

    }



    @Override

    void attachFunctor(View.AttachInfo attachInfo, int functor) {

    void attachFunctor(View.AttachInfo attachInfo, long functor) {

        if (mCanvas != null) {

            mCanvas.attachFunctor(functor);

            mFunctorsRunnable.attachInfo = attachInfo;