From a23d4e792cb13090c540edfdd5cee03799bb9d48 Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Tue, 4 Jan 2011 18:59:12 -0800
Subject: unhide renderscript

Change-Id: I44dd19aec0a994316da22ea8bea01b9962f54680

api update

Change-Id: I77f5365b8b7a919cd572ceb65a9ab3871b9495d0
---
 graphics/java/android/renderscript/Allocation.java         | 14 +++++++++++++-
 graphics/java/android/renderscript/BaseObj.java            |  2 --
 graphics/java/android/renderscript/Byte2.java              |  2 +-
 graphics/java/android/renderscript/Byte3.java              |  2 +-
 graphics/java/android/renderscript/Byte4.java              |  2 +-
 graphics/java/android/renderscript/Element.java            |  2 --
 graphics/java/android/renderscript/FieldPacker.java        |  3 ++-
 graphics/java/android/renderscript/Float2.java             |  2 +-
 graphics/java/android/renderscript/Float3.java             |  2 +-
 graphics/java/android/renderscript/Float4.java             |  2 +-
 graphics/java/android/renderscript/Int2.java               |  2 +-
 graphics/java/android/renderscript/Int3.java               |  2 +-
 graphics/java/android/renderscript/Int4.java               |  2 +-
 graphics/java/android/renderscript/Matrix2f.java           |  2 +-
 graphics/java/android/renderscript/Matrix3f.java           |  2 +-
 graphics/java/android/renderscript/Matrix4f.java           |  2 +-
 graphics/java/android/renderscript/Program.java            |  1 -
 graphics/java/android/renderscript/ProgramFragment.java    |  1 -
 .../android/renderscript/ProgramFragmentFixedFunction.java |  1 -
 graphics/java/android/renderscript/ProgramRaster.java      |  1 -
 graphics/java/android/renderscript/ProgramStore.java       |  1 -
 graphics/java/android/renderscript/ProgramVertex.java      |  1 -
 .../android/renderscript/ProgramVertexFixedFunction.java   |  1 -
 graphics/java/android/renderscript/RenderScript.java       |  2 --
 graphics/java/android/renderscript/RenderScriptGL.java     |  2 --
 graphics/java/android/renderscript/Sampler.java            |  2 --
 graphics/java/android/renderscript/Script.java             |  2 +-
 graphics/java/android/renderscript/ScriptC.java            |  2 +-
 graphics/java/android/renderscript/Short2.java             |  2 +-
 graphics/java/android/renderscript/Short3.java             |  2 +-
 graphics/java/android/renderscript/Short4.java             |  2 +-
 graphics/java/android/renderscript/Type.java               |  2 --
 32 files changed, 32 insertions(+), 38 deletions(-)

(limited to 'graphics')

diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 311326a..a4ce947 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -27,7 +27,19 @@ import android.util.Log;
 import android.util.TypedValue;
 
 /**
- * @hide
+ * Memory allocation class for renderscript.  An allocation combines a Type with
+ * memory to provide storage for user data and objects.
+ *
+ * Allocations may exist in one or more memory spaces.  Currently those are
+ * Script: accessable by RS scripts.
+ * Graphics Texture: accessable as a graphics texture.
+ * Graphics Vertex: accessable as graphical vertex data.
+ * Graphics Constants: Accessable as constants in user shaders
+ *
+ * By default java side updates are always applied to the script accessable
+ * memory.  If this is not present they are then applied to the various HW
+ * memory types.  A syncAll call is necessary after the script data is update to
+ * keep the other memory spaces in sync.
  *
  **/
 public class Allocation extends BaseObj {
diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java
index 05f1bec..669beac 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/graphics/java/android/renderscript/BaseObj.java
@@ -19,8 +19,6 @@ package android.renderscript;
 import android.util.Log;
 
 /**
- * @hide
- *
  * BaseObj is the base class for interfacing with native renderscript objects.
  * It primarly contains code for tracking the native object ID and forcably
  * disconecting the object from the native allocation for early cleanup.
diff --git a/graphics/java/android/renderscript/Byte2.java b/graphics/java/android/renderscript/Byte2.java
index 95cf88c..6d2994d 100644
--- a/graphics/java/android/renderscript/Byte2.java
+++ b/graphics/java/android/renderscript/Byte2.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs byte2 type back to java applications.
  *
  **/
 public class Byte2 {
diff --git a/graphics/java/android/renderscript/Byte3.java b/graphics/java/android/renderscript/Byte3.java
index a6c0ca9..dd73914 100644
--- a/graphics/java/android/renderscript/Byte3.java
+++ b/graphics/java/android/renderscript/Byte3.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs byte3 type back to java applications.
  *
  **/
 public class Byte3 {
diff --git a/graphics/java/android/renderscript/Byte4.java b/graphics/java/android/renderscript/Byte4.java
index a5bfc61..ebea589 100644
--- a/graphics/java/android/renderscript/Byte4.java
+++ b/graphics/java/android/renderscript/Byte4.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs byte4 type back to java applications.
  *
  **/
 public class Byte4 {
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index 7616316..e07fdfb 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -20,8 +20,6 @@ import java.lang.reflect.Field;
 import android.util.Log;
 
 /**
- * @hide
- *
  * Element is the basic data type of RenderScript.  An element can be of 2
  * forms.  Basic elements contain a single component of data.  This can be of
  * any of the legal RS types.  Examples of basic element types.
diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index 2a585fd..2fb3d95 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/graphics/java/android/renderscript/FieldPacker.java
@@ -18,7 +18,8 @@ package android.renderscript;
 
 
 /**
- * @hide
+ * Utility class for packing arguments and structures from java objects to rs
+ * objects.
  *
  **/
 public class FieldPacker {
diff --git a/graphics/java/android/renderscript/Float2.java b/graphics/java/android/renderscript/Float2.java
index 889bf7b..0a099f1 100644
--- a/graphics/java/android/renderscript/Float2.java
+++ b/graphics/java/android/renderscript/Float2.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs float2 type back to java applications.
  *
  **/
 public class Float2 {
diff --git a/graphics/java/android/renderscript/Float3.java b/graphics/java/android/renderscript/Float3.java
index ebe140d..2ffa326 100644
--- a/graphics/java/android/renderscript/Float3.java
+++ b/graphics/java/android/renderscript/Float3.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs float3 type back to java applications.
  *
  **/
 public class Float3 {
diff --git a/graphics/java/android/renderscript/Float4.java b/graphics/java/android/renderscript/Float4.java
index 847732f..19d91dc 100644
--- a/graphics/java/android/renderscript/Float4.java
+++ b/graphics/java/android/renderscript/Float4.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs float4 type back to java applications.
  *
  **/
 public class Float4 {
diff --git a/graphics/java/android/renderscript/Int2.java b/graphics/java/android/renderscript/Int2.java
index 56e2fe9..8eceb71 100644
--- a/graphics/java/android/renderscript/Int2.java
+++ b/graphics/java/android/renderscript/Int2.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs int2 type back to java applications.
  *
  **/
 public class Int2 {
diff --git a/graphics/java/android/renderscript/Int3.java b/graphics/java/android/renderscript/Int3.java
index 1b27509..bbd296e 100644
--- a/graphics/java/android/renderscript/Int3.java
+++ b/graphics/java/android/renderscript/Int3.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs int3 type back to java applications.
  *
  **/
 public class Int3 {
diff --git a/graphics/java/android/renderscript/Int4.java b/graphics/java/android/renderscript/Int4.java
index 3d6f3f5..c3ae112c 100644
--- a/graphics/java/android/renderscript/Int4.java
+++ b/graphics/java/android/renderscript/Int4.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs int4 type back to java applications.
  *
  **/
 public class Int4 {
diff --git a/graphics/java/android/renderscript/Matrix2f.java b/graphics/java/android/renderscript/Matrix2f.java
index 6aa7d1b..2fffe8c 100644
--- a/graphics/java/android/renderscript/Matrix2f.java
+++ b/graphics/java/android/renderscript/Matrix2f.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs_matrix2x2 type back to java applications.
  *
  **/
 public class Matrix2f {
diff --git a/graphics/java/android/renderscript/Matrix3f.java b/graphics/java/android/renderscript/Matrix3f.java
index 2d227a5..e4c5e00 100644
--- a/graphics/java/android/renderscript/Matrix3f.java
+++ b/graphics/java/android/renderscript/Matrix3f.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs_matrix3x3 type back to java applications.
  *
  **/
 public class Matrix3f {
diff --git a/graphics/java/android/renderscript/Matrix4f.java b/graphics/java/android/renderscript/Matrix4f.java
index 144a9a3..ec07cd5 100644
--- a/graphics/java/android/renderscript/Matrix4f.java
+++ b/graphics/java/android/renderscript/Matrix4f.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs_matrix4x4 type back to java applications.
  *
  **/
 public class Matrix4f {
diff --git a/graphics/java/android/renderscript/Program.java b/graphics/java/android/renderscript/Program.java
index a9eaec3..b07ae7d 100644
--- a/graphics/java/android/renderscript/Program.java
+++ b/graphics/java/android/renderscript/Program.java
@@ -27,7 +27,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class Program extends BaseObj {
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java
index 59d4967..7f12661 100644
--- a/graphics/java/android/renderscript/ProgramFragment.java
+++ b/graphics/java/android/renderscript/ProgramFragment.java
@@ -22,7 +22,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramFragment extends Program {
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
index d011219..f0040c6 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
@@ -22,7 +22,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramFragmentFixedFunction extends ProgramFragment {
diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/graphics/java/android/renderscript/ProgramRaster.java
index 3bdd71d..71c527d 100644
--- a/graphics/java/android/renderscript/ProgramRaster.java
+++ b/graphics/java/android/renderscript/ProgramRaster.java
@@ -22,7 +22,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramRaster extends BaseObj {
diff --git a/graphics/java/android/renderscript/ProgramStore.java b/graphics/java/android/renderscript/ProgramStore.java
index 2d2b162..0e2227e 100644
--- a/graphics/java/android/renderscript/ProgramStore.java
+++ b/graphics/java/android/renderscript/ProgramStore.java
@@ -22,7 +22,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramStore extends BaseObj {
diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/graphics/java/android/renderscript/ProgramVertex.java
index 954ac9a..13800ff 100644
--- a/graphics/java/android/renderscript/ProgramVertex.java
+++ b/graphics/java/android/renderscript/ProgramVertex.java
@@ -23,7 +23,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramVertex extends Program {
diff --git a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
index 2240dd7..1b69efe 100644
--- a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
@@ -23,7 +23,6 @@ import android.util.Log;
 
 
 /**
- * @hide
  *
  **/
 public class ProgramVertexFixedFunction extends ProgramVertex {
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index f11b1ab..6a52810 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -27,8 +27,6 @@ import android.view.Surface;
 
 
 /**
- * @hide
- *
  * RenderScript base master class.  An instance of this class creates native
  * worker threads for processing commands from this object.  This base class
  * does not provide any extended capabilities beyond simple data processing.
diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java
index 5adb682..ed84f6c 100644
--- a/graphics/java/android/renderscript/RenderScriptGL.java
+++ b/graphics/java/android/renderscript/RenderScriptGL.java
@@ -29,8 +29,6 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
 /**
- * @hide
- *
  * The Graphics derivitive of RenderScript.  Extends the basic context to add a
  * root script which is the display window for graphical output.  When the
  * system needs to update the display the currently bound root script will be
diff --git a/graphics/java/android/renderscript/Sampler.java b/graphics/java/android/renderscript/Sampler.java
index 6faa206..57a9889 100644
--- a/graphics/java/android/renderscript/Sampler.java
+++ b/graphics/java/android/renderscript/Sampler.java
@@ -29,8 +29,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
 /**
- * @hide
- *
  * Sampler object which defines how data is extracted from textures.  Samplers
  * are attached to Program objects (currently only fragment) when those objects
  * need to access texture data.
diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java
index aaf5475..ddf41cb 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/graphics/java/android/renderscript/Script.java
@@ -17,7 +17,7 @@
 package android.renderscript;
 
 /**
- * @hide
+ *
  **/
 public class Script extends BaseObj {
     public static final int MAX_SLOT = 16;
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java
index c1e4358..984edd3 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/graphics/java/android/renderscript/ScriptC.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
 /**
- * @hide
+ *
  **/
 public class ScriptC extends Script {
     private static final String TAG = "ScriptC";
diff --git a/graphics/java/android/renderscript/Short2.java b/graphics/java/android/renderscript/Short2.java
index 426801f..82d897e 100644
--- a/graphics/java/android/renderscript/Short2.java
+++ b/graphics/java/android/renderscript/Short2.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs short2 type back to java applications.
  *
  **/
 public class Short2 {
diff --git a/graphics/java/android/renderscript/Short3.java b/graphics/java/android/renderscript/Short3.java
index 7b9c305..00da574 100644
--- a/graphics/java/android/renderscript/Short3.java
+++ b/graphics/java/android/renderscript/Short3.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs short3 type back to java applications.
  *
  **/
 public class Short3 {
diff --git a/graphics/java/android/renderscript/Short4.java b/graphics/java/android/renderscript/Short4.java
index 9a474e2..450258d 100644
--- a/graphics/java/android/renderscript/Short4.java
+++ b/graphics/java/android/renderscript/Short4.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 
 /**
- * @hide
+ * Class for exposing the rs short4 type back to java applications.
  *
  **/
 public class Short4 {
diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java
index d98842a..b5830d5 100644
--- a/graphics/java/android/renderscript/Type.java
+++ b/graphics/java/android/renderscript/Type.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Field;
 import android.util.Log;
 
 /**
- * @hide
- *
  * Type is an allocation template.  It consists of an Element and one or more
  * dimensions.  It describes only the layout of memory but does not allocate and
  * storage for the data thus described.
-- 
cgit v1.1