Merge "AArch64: Make graphics classes 64-bit compatible" (6e09eb4c) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+132 −132

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/GLES20DisplayList.java

+49 −49

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ class GLES20DisplayList extends DisplayList {
		return mValid && mFinalizer != null;
		}

		int getNativeDisplayList() {
		long getNativeDisplayList() {
		if (!mValid \|\| mFinalizer == null) {
		throw new IllegalStateException("The display list is not valid.");
		}
		@@ -124,9 +124,9 @@ class GLES20DisplayList extends DisplayList {
		return nGetDisplayListSize(mFinalizer.mNativeDisplayList);
		}

		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);

		///////////////////////////////////////////////////////////////////////////
		// Native View Properties
		@@ -440,62 +440,62 @@ class GLES20DisplayList extends DisplayList {
		}
		}

		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 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 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 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 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 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 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 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 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);

		///////////////////////////////////////////////////////////////////////////
		// 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/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/GraphicBuffer.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class GraphicBuffer implements Parcelable {
		private final int mFormat;
		private final int mUsage;
		// Note: do not rename, this field is used by native code
		private final int mNativeObject;
		private final long mNativeObject;

		// These two fields are only used by lock/unlockCanvas()
		private Canvas mCanvas;
		@@ -77,7 +77,7 @@ public class GraphicBuffer implements Parcelable {
		* @return A <code>GraphicBuffer</code> instance or null
		*/
		public static GraphicBuffer create(int width, int height, int format, int usage) {
		int nativeObject = nCreateGraphicBuffer(width, height, format, usage);
		long nativeObject = nCreateGraphicBuffer(width, height, format, usage);
		if (nativeObject != 0) {
		return new GraphicBuffer(width, height, format, usage, nativeObject);
		}
		@@ -87,7 +87,7 @@ public class GraphicBuffer implements Parcelable {
		/**
		* Private use only. See {@link #create(int, int, int, int)}.
		*/
		private GraphicBuffer(int width, int height, int format, int usage, int nativeObject) {
		private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) {
		mWidth = width;
		mHeight = height;
		mFormat = format;
		@@ -271,7 +271,7 @@ public class GraphicBuffer implements Parcelable {
		int height = in.readInt();
		int format = in.readInt();
		int usage = in.readInt();
		int nativeObject = nReadGraphicBufferFromParcel(in);
		long nativeObject = nReadGraphicBufferFromParcel(in);
		if (nativeObject != 0) {
		return new GraphicBuffer(width, height, format, usage, nativeObject);
		}
		@@ -283,10 +283,10 @@ public class GraphicBuffer implements Parcelable {
		}
		};

		private static native int nCreateGraphicBuffer(int width, int height, int format, int usage);
		private static native void nDestroyGraphicBuffer(int nativeObject);
		private static native void nWriteGraphicBufferToParcel(int nativeObject, Parcel dest);
		private static native int nReadGraphicBufferFromParcel(Parcel in);
		private static native boolean nLockCanvas(int nativeObject, Canvas canvas, Rect dirty);
		private static native boolean nUnlockCanvasAndPost(int nativeObject, Canvas canvas);
		private static native long nCreateGraphicBuffer(int width, int height, int format, int usage);
		private static native void nDestroyGraphicBuffer(long nativeObject);
		private static native void nWriteGraphicBufferToParcel(long nativeObject, Parcel dest);
		private static native long nReadGraphicBufferFromParcel(Parcel in);
		private static native boolean nLockCanvas(long nativeObject, Canvas canvas, Rect dirty);
		private static native boolean nUnlockCanvasAndPost(long nativeObject, Canvas canvas);
		}