Merge "Unhide new RS APIs." into jb-mr2-dev (330a9fe3) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -20198,11 +20198,13 @@ package android.renderscript {
		public class RenderScript {
		method public void contextDump();
		method public static android.renderscript.RenderScript create(android.content.Context);
		method public static android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType);
		method public void destroy();
		method public void finish();
		method public final android.content.Context getApplicationContext();
		method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler();
		method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler();
		method public void sendMessage(int, int[]);
		method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler);
		method public void setMessageHandler(android.renderscript.RenderScript.RSMessageHandler);
		method public void setPriority(android.renderscript.RenderScript.Priority);
		@@ -20365,6 +20367,13 @@ package android.renderscript {
		public abstract class ScriptIntrinsic extends android.renderscript.Script {
		}

		public final class ScriptIntrinsic3DLUT extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsic3DLUT 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 setLUT(android.renderscript.Allocation);
		}

		public class ScriptIntrinsicBlend extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEachAdd(android.renderscript.Allocation, android.renderscript.Allocation);
		@@ -20484,6 +20493,7 @@ package android.renderscript {
		method public android.renderscript.Element getElement();
		method public int getX();
		method public int getY();
		method public int getYuv();
		method public int getZ();
		method public boolean hasFaces();
		method public boolean hasMipmaps();
		@@ -20496,6 +20506,7 @@ package android.renderscript {
		method public android.renderscript.Type.Builder setMipmaps(boolean);
		method public android.renderscript.Type.Builder setX(int);
		method public android.renderscript.Type.Builder setY(int);
		method public android.renderscript.Type.Builder setYuvFormat(int);
		method public android.renderscript.Type.Builder setZ(int);
		}

graphics/java/android/renderscript/RenderScript.java

+23 −2

Original line number	Diff line number	Diff line
		@@ -99,9 +99,29 @@ public class RenderScript {
		mCacheDir = cacheDir;
		}

		/**
		* ContextType specifies the specific type of context to be created.
		*
		*/
		public enum ContextType {
		/**
		* NORMAL context, this is the default and what shipping apps should
		* use.
		*/
		NORMAL (0),

		/**
		* DEBUG context, perform extra runtime checks to validate the
		* kernels and APIs are being used as intended. Get and SetElementAt
		* will be bounds checked in this mode.
		*/
		DEBUG (1),

		/**
		* PROFILE context, Intended to be used once the first time an
		* application is run on a new device. This mode allows the runtime to
		* do additional testing and performance tuning.
		*/
		PROFILE (2);

		int mID;
		@@ -915,7 +935,8 @@ public class RenderScript {
		}

		/**
		* @hide
		* Place a message into the message queue to be sent back to the message
		* handler once all previous commands have been executed.
		*
		* @param id
		* @param data
		@@ -1194,9 +1215,9 @@ public class RenderScript {
		/**
		* Create a basic RenderScript context.
		*
		* @hide
		*
		* @param ctx The context.
		* @param ct The type of context to be created.
		* @return RenderScript
		*/
		public static RenderScript create(Context ctx, ContextType ct) {

graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,11 @@ import android.util.Log;

		/**
		*
		* @hide
		* Intrinsic for converting RGB to RGBA by using a 3D lookup table. The
		* incoming r,g,b values are use as normalized x,y,z coordinates into a 3D
		* allocation. The 8 nearest values are sampled and linearly interpolated. The
		* result is placed in the output.
		*
		**/
		public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic {
		private Allocation mLUT;

graphics/java/android/renderscript/Type.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ public class Type extends BaseObj {
		/**
		* Get the YUV format
		*
		* @hide
		*
		* @return int
		*/
		public int getYuv() {
		@@ -277,7 +277,9 @@ public class Type extends BaseObj {
		}

		/**
		* @hide
		* Set the YUV layout for a Type. This controls how the memory is
		* interpreted. Generally and application should not need to call this
		* function and it would be set by the Camera.
		*
		* only NV21, YV12. Enums from ImageFormat
		*/