Merge "Updating API based on feedback" into jb-mr2-dev (0935f258) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −12

Original line number	Diff line number	Diff line
		@@ -20299,7 +20299,6 @@ package android.renderscript {
		method public deprecated synchronized void resize(int);
		method public void setFromFieldPacker(int, android.renderscript.FieldPacker);
		method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker);
		method public void setIoInputNotificationHandler(android.renderscript.Allocation.IoInputNotifier);
		method public void setSurface(android.view.Surface);
		method public void syncAll(int);
		field public static final int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8
		@@ -20312,10 +20311,6 @@ package android.renderscript {
		field public static final int USAGE_SHARED = 128; // 0x80
		}

		public static abstract interface Allocation.IoInputNotifier {
		method public abstract void onBufferAvailable(android.renderscript.Allocation);
		}

		public static final class Allocation.MipmapControl extends java.lang.Enum {
		method public static android.renderscript.Allocation.MipmapControl valueOf(java.lang.String);
		method public static final android.renderscript.Allocation.MipmapControl[] values();
		@@ -20898,13 +20893,6 @@ package android.renderscript {
		method public android.renderscript.Script.LaunchOptions setX(int, int);
		method public android.renderscript.Script.LaunchOptions setY(int, int);
		method public android.renderscript.Script.LaunchOptions setZ(int, int);
		field protected int strategy;
		field protected int xend;
		field protected int xstart;
		field protected int yend;
		field protected int ystart;
		field protected int zend;
		field protected int zstart;
		}

		public class ScriptC extends android.renderscript.Script {

graphics/java/android/renderscript/Allocation.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1711,6 +1711,8 @@ public class Allocation extends BaseObj {
		}

		/**
		* @hide
		*
		* Interface to handle notification when new buffers are
		* available via USAGE_IO_INPUT. An application will receive
		* one notification when a buffer is available. Additional
		@@ -1722,6 +1724,8 @@ public class Allocation extends BaseObj {
		}

		/**
		* @hide
		*
		* Set a notification handler for USAGE_IO_INPUT
		*
		* @param callback instance of the IoInputNotifier class to be called

graphics/java/android/renderscript/FieldPacker.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ import java.util.BitSet;
		* Utility class for packing arguments and structures from Android system objects to
		* Renderscript objects.
		*
		* This class is only intended to be used to support the
		* reflected code generated by the RS tool chain. It should not
		* be called directly.
		*
		**/
		public class FieldPacker {
		public FieldPacker(int len) {

graphics/java/android/renderscript/Script.java

+89 −9

Original line number	Diff line number	Diff line
		@@ -166,6 +166,15 @@ public class Script extends BaseObj {
		mRS.nScriptForEach(getID(mRS), slot, in_id, out_id, params);
		}

		/**
		* Only intended for use by generated reflected code.
		*
		* @param slot
		* @param ain
		* @param aout
		* @param v
		* @param sc
		*/
		protected void forEach(int slot, Allocation ain, Allocation aout, FieldPacker v, LaunchOptions sc) {
		if (ain == null && aout == null) {
		throw new RSIllegalArgumentException(
		@@ -310,6 +319,12 @@ public class Script extends BaseObj {
		mRS.nScriptSetVarVE(getID(mRS), index, v.getData(), e.getID(mRS), dims);
		}

		/**
		* Only intended for use by generated reflected code.
		*
		* @param index
		* @param v
		*/
		public void getVarV(int index, FieldPacker v) {
		mRS.nScriptGetVarV(getID(mRS), index, v.getData());
		}
		@@ -332,6 +347,10 @@ public class Script extends BaseObj {
		}


		/**
		* Only intended for use by generated reflected code.
		*
		*/
		public static class FieldBase {
		protected Element mElement;
		protected Allocation mAllocation;
		@@ -364,16 +383,29 @@ public class Script extends BaseObj {
		}
		}

		public static final class LaunchOptions {
		protected int xstart = 0;
		protected int ystart = 0;
		protected int xend = 0;
		protected int yend = 0;
		protected int zstart = 0;
		protected int zend = 0;

		protected int strategy;
		/**
		* Class used to specify clipping for a kernel launch.
		*
		*/
		public static final class LaunchOptions {
		private int xstart = 0;
		private int ystart = 0;
		private int xend = 0;
		private int yend = 0;
		private int zstart = 0;
		private int zend = 0;
		private int strategy;

		/**
		* Set the X range. If the end value is set to 0 the X dimension is not
		* clipped.
		*
		* @param xstartArg Must be >= 0
		* @param xendArg Must be >= xstartArg
		*
		* @return LaunchOptions
		*/
		public LaunchOptions setX(int xstartArg, int xendArg) {
		if (xstartArg < 0 \|\| xendArg <= xstartArg) {
		throw new RSIllegalArgumentException("Invalid dimensions");
		@@ -383,6 +415,15 @@ public class Script extends BaseObj {
		return this;
		}

		/**
		* Set the Y range. If the end value is set to 0 the Y dimension is not
		* clipped.
		*
		* @param ystartArg Must be >= 0
		* @param yendArg Must be >= ystartArg
		*
		* @return LaunchOptions
		*/
		public LaunchOptions setY(int ystartArg, int yendArg) {
		if (ystartArg < 0 \|\| yendArg <= ystartArg) {
		throw new RSIllegalArgumentException("Invalid dimensions");
		@@ -392,6 +433,15 @@ public class Script extends BaseObj {
		return this;
		}

		/**
		* Set the Z range. If the end value is set to 0 the Z dimension is not
		* clipped.
		*
		* @param zstartArg Must be >= 0
		* @param zendArg Must be >= zstartArg
		*
		* @return LaunchOptions
		*/
		public LaunchOptions setZ(int zstartArg, int zendArg) {
		if (zstartArg < 0 \|\| zendArg <= zstartArg) {
		throw new RSIllegalArgumentException("Invalid dimensions");
		@@ -402,21 +452,51 @@ public class Script extends BaseObj {
		}


		/**
		* Returns the current X start
		*
		* @return int current value
		*/
		public int getXStart() {
		return xstart;
		}
		/**
		* Returns the current X end
		*
		* @return int current value
		*/
		public int getXEnd() {
		return xend;
		}
		/**
		* Returns the current Y start
		*
		* @return int current value
		*/
		public int getYStart() {
		return ystart;
		}
		/**
		* Returns the current Y end
		*
		* @return int current value
		*/
		public int getYEnd() {
		return yend;
		}
		/**
		* Returns the current Z start
		*
		* @return int current value
		*/
		public int getZStart() {
		return zstart;
		}
		/**
		* Returns the current Z end
		*
		* @return int current value
		*/
		public int getZEnd() {
		return zend;
		}