Merge "Implement array types" (2a3cdf57) · Commits · e / os / android_frameworks_base

rs/java/android/renderscript/Allocation.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -58,15 +58,13 @@ public class Allocation extends BaseObj {
	Allocation mAdaptedAllocation;		Allocation mAdaptedAllocation;
	int mSize;		int mSize;

	boolean mConstrainedLOD;
	boolean mConstrainedFace;
	boolean mConstrainedY;
	boolean mConstrainedZ;
	boolean mReadAllowed = true;		boolean mReadAllowed = true;
	boolean mWriteAllowed = true;		boolean mWriteAllowed = true;
			int mSelectedX;
	int mSelectedY;		int mSelectedY;
	int mSelectedZ;		int mSelectedZ;
	int mSelectedLOD;		int mSelectedLOD;
			int mSelectedArray[];
	Type.CubemapFace mSelectedFace = Type.CubemapFace.POSITIVE_X;		Type.CubemapFace mSelectedFace = Type.CubemapFace.POSITIVE_X;

	int mCurrentDimX;		int mCurrentDimX;

rs/java/android/renderscript/AllocationAdapter.java

+152 −81

Original line number	Original line	Diff line number	Diff line
	@@ -21,76 +21,20 @@ package android.renderscript;
	*		*
	**/		**/
	public class AllocationAdapter extends Allocation {		public class AllocationAdapter extends Allocation {
	AllocationAdapter(long id, RenderScript rs, Allocation alloc) {		Type mWindow;

			AllocationAdapter(long id, RenderScript rs, Allocation alloc, Type t) {
	super(id, rs, alloc.mType, alloc.mUsage);		super(id, rs, alloc.mType, alloc.mUsage);
	mAdaptedAllocation = alloc;		mAdaptedAllocation = alloc;
			mWindow = t;
	}		}

			/*
	long getID(RenderScript rs) {		long getID(RenderScript rs) {
	throw new RSInvalidStateException(		throw new RSInvalidStateException(
	"This operation is not supported with adapters at this time.");		"This operation is not supported with adapters at this time.");
	}		}

	/**
	* @hide
	*/
	public void subData(int xoff, FieldPacker fp) {
	super.setFromFieldPacker(xoff, fp);
	}
	/**
	* @hide
	*/
	public void subElementData(int xoff, int component_number, FieldPacker fp) {
	super.setFromFieldPacker(xoff, component_number, fp);
	}
	/**
	* @hide
	*/
	public void subData1D(int off, int count, int[] d) {
	super.copy1DRangeFrom(off, count, d);
	}
	/**
	* @hide
	*/
	public void subData1D(int off, int count, short[] d) {
	super.copy1DRangeFrom(off, count, d);
	}
	/**
	* @hide
	*/
	public void subData1D(int off, int count, byte[] d) {
	super.copy1DRangeFrom(off, count, d);
	}
	/**
	* @hide
	*/
	public void subData1D(int off, int count, float[] d) {
	super.copy1DRangeFrom(off, count, d);
	}
	/**
	* @hide
	*/		*/
	public void subData2D(int xoff, int yoff, int w, int h, int[] d) {
	super.copy2DRangeFrom(xoff, yoff, w, h, d);
	}
	/**
	* @hide
	*/
	public void subData2D(int xoff, int yoff, int w, int h, float[] d) {
	super.copy2DRangeFrom(xoff, yoff, w, h, d);
	}
	/**
	* @hide
	*/
	public void readData(int[] d) {
	super.copyTo(d);
	}
	/**
	* @hide
	*/
	public void readData(float[] d) {
	super.copyTo(d);
	}

	void initLOD(int lod) {		void initLOD(int lod) {
	if (lod < 0) {		if (lod < 0) {
	@@ -125,6 +69,26 @@ public class AllocationAdapter extends Allocation {
	mSelectedZ = 0;		mSelectedZ = 0;
	}		}

			private void updateOffsets() {
			int a1 = 0, a2 = 0, a3 = 0, a4 = 0;

			if (mSelectedArray.length > 0) {
			a1 = mSelectedArray[0];
			}
			if (mSelectedArray.length > 1) {
			a2 = mSelectedArray[2];
			}
			if (mSelectedArray.length > 2) {
			a3 = mSelectedArray[2];
			}
			if (mSelectedArray.length > 3) {
			a4 = mSelectedArray[3];
			}
			mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ,
			mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4);

			}

	/**		/**
	* Set the active LOD. The LOD must be within the range for the		* Set the active LOD. The LOD must be within the range for the
	* type being adapted. The base allocation must have mipmaps.		* type being adapted. The base allocation must have mipmaps.
	@@ -138,11 +102,13 @@ public class AllocationAdapter extends Allocation {
	if (!mAdaptedAllocation.getType().hasMipmaps()) {		if (!mAdaptedAllocation.getType().hasMipmaps()) {
	throw new RSInvalidStateException("Cannot set LOD when the allocation type does not include mipmaps.");		throw new RSInvalidStateException("Cannot set LOD when the allocation type does not include mipmaps.");
	}		}
	if (!mConstrainedLOD) {		if (mWindow.hasMipmaps()) {
	throw new RSInvalidStateException("Cannot set LOD when the adapter includes mipmaps.");		throw new RSInvalidStateException("Cannot set LOD when the adapter includes mipmaps.");
	}		}

	initLOD(lod);		initLOD(lod);
			mSelectedLOD = lod;
			updateOffsets();
	}		}

	/**		/**
	@@ -155,14 +121,38 @@ public class AllocationAdapter extends Allocation {
	if (!mAdaptedAllocation.getType().hasFaces()) {		if (!mAdaptedAllocation.getType().hasFaces()) {
	throw new RSInvalidStateException("Cannot set Face when the allocation type does not include faces.");		throw new RSInvalidStateException("Cannot set Face when the allocation type does not include faces.");
	}		}
	if (!mConstrainedFace) {		if (mWindow.hasFaces()) {
	throw new RSInvalidStateException("Cannot set LOD when the adapter includes mipmaps.");		throw new RSInvalidStateException("Cannot set face when the adapter includes faces.");
	}		}
	if (cf == null) {		if (cf == null) {
	throw new RSIllegalArgumentException("Cannot set null face.");		throw new RSIllegalArgumentException("Cannot set null face.");
	}		}

	mSelectedFace = cf;		mSelectedFace = cf;
			updateOffsets();
			}


			/**
			* @hide
			* Set the active X. The x value must be within the range for
			* the allocation being adapted.
			*
			* @param x The x to make active.
			*/
			public void setX(int x) {
			if (mAdaptedAllocation.getType().getX() <= x) {
			throw new RSInvalidStateException("Cannot set X greater than dimension of allocation.");
			}
			if (mWindow.getX() == mAdaptedAllocation.getType().getX()) {
			throw new RSInvalidStateException("Cannot set X when the adapter includes X.");
			}
			if ((mWindow.getX() + x) >= mAdaptedAllocation.getType().getX()) {
			throw new RSInvalidStateException("Cannot set (X + window) which would be larger than dimension of allocation.");
			}

			mSelectedX = x;
			updateOffsets();
	}		}

	/**		/**
	@@ -179,11 +169,15 @@ public class AllocationAdapter extends Allocation {
	if (mAdaptedAllocation.getType().getY() <= y) {		if (mAdaptedAllocation.getType().getY() <= y) {
	throw new RSInvalidStateException("Cannot set Y greater than dimension of allocation.");		throw new RSInvalidStateException("Cannot set Y greater than dimension of allocation.");
	}		}
	if (!mConstrainedY) {		if (mWindow.getY() == mAdaptedAllocation.getType().getY()) {
	throw new RSInvalidStateException("Cannot set Y when the adapter includes Y.");		throw new RSInvalidStateException("Cannot set Y when the adapter includes Y.");
	}		}
			if ((mWindow.getY() + y) >= mAdaptedAllocation.getType().getY()) {
			throw new RSInvalidStateException("Cannot set (Y + window) which would be larger than dimension of allocation.");
			}

	mSelectedY = y;		mSelectedY = y;
			updateOffsets();
	}		}

	/**		/**
	@@ -200,35 +194,112 @@ public class AllocationAdapter extends Allocation {
	if (mAdaptedAllocation.getType().getZ() <= z) {		if (mAdaptedAllocation.getType().getZ() <= z) {
	throw new RSInvalidStateException("Cannot set Z greater than dimension of allocation.");		throw new RSInvalidStateException("Cannot set Z greater than dimension of allocation.");
	}		}
	if (!mConstrainedZ) {		if (mWindow.getZ() == mAdaptedAllocation.getType().getZ()) {
	throw new RSInvalidStateException("Cannot set Z when the adapter includes Z.");		throw new RSInvalidStateException("Cannot set Z when the adapter includes Z.");
	}		}
			if ((mWindow.getZ() + z) >= mAdaptedAllocation.getType().getZ()) {
			throw new RSInvalidStateException("Cannot set (Z + window) which would be larger than dimension of allocation.");
			}

	mSelectedZ = z;		mSelectedZ = z;
			updateOffsets();
			}

			/**
			* @hide
			*/
			public void setArray(int arrayNum, int arrayVal) {
			if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) {
			throw new RSInvalidStateException("Cannot set arrayNum when the allocation type does not include arrayNum dim.");
			}
			if (mAdaptedAllocation.getType().getArray(arrayNum) <= arrayVal) {
			throw new RSInvalidStateException("Cannot set arrayNum greater than dimension of allocation.");
			}
			if (mWindow.getArray(arrayNum) == mAdaptedAllocation.getType().getArray(arrayNum)) {
			throw new RSInvalidStateException("Cannot set arrayNum when the adapter includes arrayNum.");
			}
			if ((mWindow.getArray(arrayNum) + arrayVal) >= mAdaptedAllocation.getType().getArray(arrayNum)) {
			throw new RSInvalidStateException("Cannot set (arrayNum + window) which would be larger than dimension of allocation.");
			}

			mSelectedArray[arrayNum] = arrayVal;
			updateOffsets();
	}		}

	static public AllocationAdapter create1D(RenderScript rs, Allocation a) {		static public AllocationAdapter create1D(RenderScript rs, Allocation a) {
	rs.validate();		rs.validate();
	AllocationAdapter aa = new AllocationAdapter(0, rs, a);		Type t = Type.createX(rs, a.getElement(), a.getType().getX());
	aa.mConstrainedLOD = true;		return createTyped(rs, a, t);
	aa.mConstrainedFace = true;
	aa.mConstrainedY = true;
	aa.mConstrainedZ = true;
	aa.initLOD(0);
	return aa;
	}		}


	static public AllocationAdapter create2D(RenderScript rs, Allocation a) {		static public AllocationAdapter create2D(RenderScript rs, Allocation a) {
	rs.validate();		rs.validate();
	AllocationAdapter aa = new AllocationAdapter(0, rs, a);		Type t = Type.createXY(rs, a.getElement(), a.getType().getX(), a.getType().getY());
	aa.mConstrainedLOD = true;		return createTyped(rs, a, t);
	aa.mConstrainedFace = true;
	aa.mConstrainedY = false;
	aa.mConstrainedZ = true;
	aa.initLOD(0);
	return aa;
	}		}

			/**
			* @hide
			*
			* Create an arbitrary window into the base allocation
			* The type describes the shape of the window.
			*
			* Any dimensions present in the type must be equal or smaller
			* to the dimensions in the source allocation. A dimension
			* present in the allocation that is not present in the type
			* will be constrained away with the selectors
			*
			* If a dimension is present in the type and allcation one of
			* two things will happen
			*
			* If the type is smaller than the allocation a window will be
			* created, the selected value in the adapter for that dimension
			* will act as the base address and the type will describe the
			* size of the view starting at that point.
			*
			* If the type and allocation dimension are of the same size
			* then setting the selector for the dimension will be an error.
			*/
			static public AllocationAdapter createTyped(RenderScript rs, Allocation a, Type t) {
			rs.validate();

			if (a.mAdaptedAllocation != null) {
			throw new RSInvalidStateException("Adapters cannot be nested.");
			}

			if (!a.getType().getElement().equals(t.getElement())) {
			throw new RSInvalidStateException("Element must match Allocation type.");
			}

			if (t.hasFaces() \|\| t.hasMipmaps()) {
			throw new RSInvalidStateException("Adapters do not support window types with Mipmaps or Faces.");
			}

			Type at = a.getType();
			if ((t.getX() > at.getX()) \|\|
			(t.getY() > at.getY()) \|\|
			(t.getZ() > at.getZ()) \|\|
			(t.getArrayCount() > at.getArrayCount())) {

			throw new RSInvalidStateException("Type cannot have dimension larger than the source allocation.");
			}

			if (t.getArrayCount() > 0) {
			for (int i = 0; i < t.getArray(i); i++) {
			if (t.getArray(i) > at.getArray(i)) {
			throw new RSInvalidStateException("Type cannot have dimension larger than the source allocation.");
			}
			}
			}

			// Create the object
			long id = rs.nAllocationAdapterCreate(a.getID(rs), t.getID(rs));
			if (id == 0) {
			throw new RSRuntimeException("AllocationAdapter creation failed.");
			}
			return new AllocationAdapter(id, rs, a, t);
			}

	/**		/**
	* Override the Allocation resize. Resizing adapters is not		* Override the Allocation resize. Resizing adapters is not

rs/java/android/renderscript/RenderScript.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -591,6 +591,20 @@ public class RenderScript {
	rsnAllocationResize1D(mContext, id, dimX);		rsnAllocationResize1D(mContext, id, dimX);
	}		}

			native long rsnAllocationAdapterCreate(long con, long allocId, long typeId);
			synchronized long nAllocationAdapterCreate(long allocId, long typeId) {
			validate();
			return rsnAllocationAdapterCreate(mContext, allocId, typeId);
			}

			native void rsnAllocationAdapterOffset(long con, long id, int x, int y, int z,
			int mip, int face, int a1, int a2, int a3, int a4);
			synchronized void nAllocationAdapterOffset(long id, int x, int y, int z,
			int mip, int face, int a1, int a2, int a3, int a4) {
			validate();
			rsnAllocationAdapterOffset(mContext, id, x, y, z, mip, face, a1, a2, a3, a4);
			}

	native long rsnFileA3DCreateFromAssetStream(long con, long assetStream);		native long rsnFileA3DCreateFromAssetStream(long con, long assetStream);
	synchronized long nFileA3DCreateFromAssetStream(long assetStream) {		synchronized long nFileA3DCreateFromAssetStream(long assetStream) {
	validate();		validate();

rs/java/android/renderscript/Type.java

+62 −0

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,9 @@ public class Type extends BaseObj {
	int mDimYuv;		int mDimYuv;
	int mElementCount;		int mElementCount;
	Element mElement;		Element mElement;
			int mArrays[];

			static final int mMaxArrays = 4;

	public enum CubemapFace {		public enum CubemapFace {
	POSITIVE_X (0),		POSITIVE_X (0),
	@@ -146,6 +149,30 @@ public class Type extends BaseObj {
	return mElementCount;		return mElementCount;
	}		}

			/**
			* @hide
			*/
			public int getArray(int dim) {
			if ((dim < 0) \|\| (dim >= mMaxArrays)) {
			throw new RSIllegalArgumentException("Array dimension out of range.");
			}

			if (mArrays == null \|\| dim >= mArrays.length) {
			// Dimension in range but no array for that dimension allocated
			return 0;
			}

			return mArrays[dim];
			}

			/**
			* @hide
			*/
			public int getArrayCount() {
			if (mArrays != null) return mArrays.length;
			return 0;
			}

	void calcElementCount() {		void calcElementCount() {
	boolean hasLod = hasMipmaps();		boolean hasLod = hasMipmaps();
	int x = getX();		int x = getX();
	@@ -180,6 +207,13 @@ public class Type extends BaseObj {

	count += x * y * z * faces;		count += x * y * z * faces;
	}		}

			if (mArrays != null) {
			for (int ct = 0; ct < mArrays.length; ct++) {
			count *= mArrays[ct];
			}
			}

	mElementCount = count;		mElementCount = count;
	}		}

	@@ -296,6 +330,7 @@ public class Type extends BaseObj {
	boolean mDimMipmaps;		boolean mDimMipmaps;
	boolean mDimFaces;		boolean mDimFaces;
	int mYuv;		int mYuv;
			int[] mArray = new int[mMaxArrays];

	Element mElement;		Element mElement;

	@@ -341,6 +376,22 @@ public class Type extends BaseObj {
	return this;		return this;
	}		}

			/**
			* @hide
			*
			* @param dim
			* @param value
			*
			* @return Builder
			*/
			public Builder setArray(int dim, int value) {
			if(dim < 0 \|\| dim >= mMaxArrays) {
			throw new RSIllegalArgumentException("Array dimension out of range.");
			}
			mArray[dim] = value;
			return this;
			}

	public Builder setMipmaps(boolean value) {		public Builder setMipmaps(boolean value) {
	mDimMipmaps = value;		mDimMipmaps = value;
	return this;		return this;
	@@ -405,6 +456,16 @@ public class Type extends BaseObj {
	}		}
	}		}

			int[] arrays = null;
			for (int ct = mMaxArrays - 1; ct >= 0; ct--) {
			if (mArray[ct] != 0 && arrays == null) {
			arrays = new int[ct];
			}
			if ((mArray[ct] == 0) && (arrays != null)) {
			throw new RSInvalidStateException("Array dimensions must be contigous from 0.");
			}
			}

	long id = mRS.nTypeCreate(mElement.getID(mRS),		long id = mRS.nTypeCreate(mElement.getID(mRS),
	mDimX, mDimY, mDimZ, mDimMipmaps, mDimFaces, mYuv);		mDimX, mDimY, mDimZ, mDimMipmaps, mDimFaces, mYuv);
	Type t = new Type(id, mRS);		Type t = new Type(id, mRS);
	@@ -415,6 +476,7 @@ public class Type extends BaseObj {
	t.mDimMipmaps = mDimMipmaps;		t.mDimMipmaps = mDimMipmaps;
	t.mDimFaces = mDimFaces;		t.mDimFaces = mDimFaces;
	t.mDimYuv = mYuv;		t.mDimYuv = mYuv;
			t.mArrays = arrays;

	t.calcElementCount();		t.calcElementCount();
	return t;		return t;

rs/jni/android_renderscript_RenderScript.cpp

+34 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1047,6 +1047,37 @@ nAllocationResize1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint di
	rsAllocationResize1D((RsContext)con, (RsAllocation)alloc, dimX);		rsAllocationResize1D((RsContext)con, (RsAllocation)alloc, dimX);
	}		}


			static jlong
			nAllocationAdapterCreate(JNIEnv *_env, jobject _this, jlong con, jlong basealloc, jlong type)
			{
			if (kLogApi) {
			ALOGD("nAllocationAdapterCreate, con(%p), base(%p), type(%p)",
			(RsContext)con, (RsAllocation)basealloc, (RsElement)type);
			}
			return (jlong)(uintptr_t) rsAllocationAdapterCreate((RsContext)con, (RsType)type,
			(RsAllocation)basealloc);

			}

			static void
			nAllocationAdapterOffset(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
			jint x, jint y, jint z, jint face, jint lod,
			jint a1, jint a2, jint a3, jint a4)
			{
			uint32_t params[] = {
			(uint32_t)x, (uint32_t)y, (uint32_t)z, (uint32_t)face,
			(uint32_t)lod, (uint32_t)a1, (uint32_t)a2, (uint32_t)a3, (uint32_t)a4
			};
			if (kLogApi) {
			ALOGD("nAllocationAdapterOffset, con(%p), alloc(%p), x(%i), y(%i), z(%i), face(%i), lod(%i), arrays(%i %i %i %i)",
			(RsContext)con, (RsAllocation)alloc, x, y, z, face, lod, a1, a2, a3, a4);
			}
			rsAllocationAdapterOffset((RsContext)con, (RsAllocation)alloc,
			params, sizeof(params));
			}


	// -----------------------------------		// -----------------------------------

	static jlong		static jlong
	@@ -2028,6 +2059,9 @@ static JNINativeMethod methods[] = {
	{"rsnAllocationResize1D", "(JJI)V", (void*)nAllocationResize1D },		{"rsnAllocationResize1D", "(JJI)V", (void*)nAllocationResize1D },
	{"rsnAllocationGenerateMipmaps", "(JJ)V", (void*)nAllocationGenerateMipmaps },		{"rsnAllocationGenerateMipmaps", "(JJ)V", (void*)nAllocationGenerateMipmaps },

			{"rsnAllocationAdapterCreate", "(JJJ)J", (void*)nAllocationAdapterCreate },
			{"rsnAllocationAdapterOffset", "(JJIIIIIIIII)V", (void*)nAllocationAdapterOffset },

	{"rsnScriptBindAllocation", "(JJJI)V", (void*)nScriptBindAllocation },		{"rsnScriptBindAllocation", "(JJJI)V", (void*)nScriptBindAllocation },
	{"rsnScriptSetTimeZone", "(JJ[B)V", (void*)nScriptSetTimeZone },		{"rsnScriptSetTimeZone", "(JJ[B)V", (void*)nScriptSetTimeZone },
	{"rsnScriptInvoke", "(JJI)V", (void*)nScriptInvoke },		{"rsnScriptInvoke", "(JJI)V", (void*)nScriptInvoke },