Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev (a2163607) · Commits · e / os / android_frameworks_base

api/current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -20007,6 +20007,8 @@ package android.renderscript {

		public class Script extends android.renderscript.BaseObj {
		method public void bindAllocation(android.renderscript.Allocation, int);
		method protected android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element);
		method protected android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element);
		method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);
		method protected void invoke(int);
		method protected void invoke(int, android.renderscript.FieldPacker);
		@@ -20036,17 +20038,39 @@ package android.renderscript {
		field protected android.renderscript.Element mElement;
		}

		public static final class Script.FieldID extends android.renderscript.BaseObj {
		}

		public static final class Script.KernelID extends android.renderscript.BaseObj {
		}

		public class ScriptC extends android.renderscript.Script {
		ctor protected ScriptC(int, android.renderscript.RenderScript);
		ctor protected ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int);
		}

		public final class ScriptGroup extends android.renderscript.BaseObj {
		method public void execute();
		method public void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);
		method public void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);
		}

		public static final class ScriptGroup.Builder {
		ctor public ScriptGroup.Builder(android.renderscript.RenderScript);
		method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);
		method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);
		method public android.renderscript.ScriptGroup.Builder addKernel(android.renderscript.Script.KernelID);
		method public android.renderscript.ScriptGroup create();
		}

		public abstract class ScriptIntrinsic extends android.renderscript.Script {
		}

		public final class ScriptIntrinsicBlur extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation);
		method public android.renderscript.Script.FieldID getFieldID_Input();
		method public android.renderscript.Script.KernelID getKernelID();
		method public void setInput(android.renderscript.Allocation);
		method public void setRadius(float);
		}
		@@ -20054,6 +20078,7 @@ package android.renderscript {
		public final class ScriptIntrinsicColorMatrix extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
		method public android.renderscript.Script.KernelID getKernelID();
		method public void setColorMatrix(android.renderscript.Matrix4f);
		method public void setColorMatrix(android.renderscript.Matrix3f);
		method public void setGreyscale();
		@@ -20064,6 +20089,8 @@ package android.renderscript {
		public final class ScriptIntrinsicConvolve3x3 extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicConvolve3x3 create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation);
		method public android.renderscript.Script.FieldID getFieldID_Input();
		method public android.renderscript.Script.KernelID getKernelID();
		method public void setCoefficients(float[]);
		method public void setInput(android.renderscript.Allocation);
		}
		@@ -20071,6 +20098,8 @@ package android.renderscript {
		public final class ScriptIntrinsicConvolve5x5 extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicConvolve5x5 create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation);
		method public android.renderscript.Script.FieldID getFieldID_Input();
		method public android.renderscript.Script.KernelID getKernelID();
		method public void setCoefficients(float[]);
		method public void setInput(android.renderscript.Allocation);
		}
		@@ -20078,6 +20107,7 @@ package android.renderscript {
		public final class ScriptIntrinsicLUT extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
		method public android.renderscript.Script.KernelID getKernelID();
		method public void setAlpha(int, int);
		method public void setBlue(int, int);
		method public void setGreen(int, int);

graphics/java/android/renderscript/RenderScript.java

+36 −0

Original line number	Diff line number	Diff line
		@@ -567,6 +567,42 @@ public class RenderScript {
		return rsnScriptIntrinsicCreate(mContext, id, eid);
		}

		native int rsnScriptKernelIDCreate(int con, int sid, int slot, int sig);
		synchronized int nScriptKernelIDCreate(int sid, int slot, int sig) {
		validate();
		return rsnScriptKernelIDCreate(mContext, sid, slot, sig);
		}

		native int rsnScriptFieldIDCreate(int con, int sid, int slot);
		synchronized int nScriptFieldIDCreate(int sid, int slot) {
		validate();
		return rsnScriptFieldIDCreate(mContext, sid, slot);
		}

		native int rsnScriptGroupCreate(int con, int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types);
		synchronized int nScriptGroupCreate(int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types) {
		validate();
		return rsnScriptGroupCreate(mContext, kernels, src, dstk, dstf, types);
		}

		native void rsnScriptGroupSetInput(int con, int group, int kernel, int alloc);
		synchronized void nScriptGroupSetInput(int group, int kernel, int alloc) {
		validate();
		rsnScriptGroupSetInput(mContext, group, kernel, alloc);
		}

		native void rsnScriptGroupSetOutput(int con, int group, int kernel, int alloc);
		synchronized void nScriptGroupSetOutput(int group, int kernel, int alloc) {
		validate();
		rsnScriptGroupSetOutput(mContext, group, kernel, alloc);
		}

		native void rsnScriptGroupExecute(int con, int group);
		synchronized void nScriptGroupExecute(int group) {
		validate();
		rsnScriptGroupExecute(mContext, group);
		}

		native int rsnSamplerCreate(int con, int magFilter, int minFilter,
		int wrapS, int wrapT, int wrapR, float aniso);
		synchronized int nSamplerCreate(int magFilter, int minFilter,

graphics/java/android/renderscript/Script.java

+95 −0

Original line number	Diff line number	Diff line
		@@ -16,10 +16,105 @@

		package android.renderscript;

		import android.util.SparseArray;

		/**
		*
		**/
		public class Script extends BaseObj {

		/**
		* KernelID is an identifier for a Script + root function pair. It is used
		* as an identifier for ScriptGroup creation.
		*
		* This class should not be directly created. Instead use the method in the
		* reflected or intrinsic code "getKernelID_funcname()".
		*
		*/
		public static final class KernelID extends BaseObj {
		Script mScript;
		int mSlot;
		int mSig;
		KernelID(int id, RenderScript rs, Script s, int slot, int sig) {
		super(id, rs);
		mScript = s;
		mSlot = slot;
		mSig = sig;
		}
		}

		private final SparseArray<KernelID> mKIDs = new SparseArray<KernelID>();
		/**
		* Only to be used by generated reflected classes.
		*
		*
		* @param slot
		* @param sig
		* @param ein
		* @param eout
		*
		* @return KernelID
		*/
		protected KernelID createKernelID(int slot, int sig, Element ein, Element eout) {
		KernelID k = mKIDs.get(slot);
		if (k != null) {
		return k;
		}

		int id = mRS.nScriptKernelIDCreate(getID(mRS), slot, sig);
		if (id == 0) {
		throw new RSDriverException("Failed to create KernelID");
		}

		k = new KernelID(id, mRS, this, slot, sig);
		mKIDs.put(slot, k);
		return k;
		}

		/**
		* FieldID is an identifier for a Script + exported field pair. It is used
		* as an identifier for ScriptGroup creation.
		*
		* This class should not be directly created. Instead use the method in the
		* reflected or intrinsic code "getFieldID_funcname()".
		*
		*/
		public static final class FieldID extends BaseObj {
		Script mScript;
		int mSlot;
		FieldID(int id, RenderScript rs, Script s, int slot) {
		super(id, rs);
		mScript = s;
		mSlot = slot;
		}
		}

		private final SparseArray<FieldID> mFIDs = new SparseArray();
		/**
		* Only to be used by generated reflected classes.
		*
		* @param slot
		* @param e
		*
		* @return FieldID
		*/
		protected FieldID createFieldID(int slot, Element e) {
		FieldID f = mFIDs.get(slot);
		if (f != null) {
		return f;
		}

		int id = mRS.nScriptFieldIDCreate(getID(mRS), slot);
		if (id == 0) {
		throw new RSDriverException("Failed to create FieldID");
		}

		f = new FieldID(id, mRS, this, slot);
		mFIDs.put(slot, f);
		return f;
		}


		/**
		* Only intended for use by generated reflected code.
		*

graphics/java/android/renderscript/ScriptGroup.java

+297 −272

File changed.

Preview size limit exceeded, changes collapsed.

graphics/java/android/renderscript/ScriptIntrinsicBlur.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -91,5 +91,22 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic {
		forEach(0, null, aout, null);
		}

		/**
		* Get a KernelID for this intrinsic kernel.
		*
		* @return Script.KernelID The KernelID object.
		*/
		public Script.KernelID getKernelID() {
		return createKernelID(0, 2, null, null);
		}

		/**
		* Get a FieldID for the input field of this intrinsic.
		*
		* @return Script.FieldID The FieldID object.
		*/
		public Script.FieldID getFieldID_Input() {
		return createFieldID(1, null);
		}
		}