Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1d56afc6: Merge "Revert "Deprecate"" into jb-dev

Browse Source 
* commit '1d56afc6ace90e7cbd32d776b73173ef0dfa95c4':
  Revert "Deprecate"
This commit is contained in:
Stephen Hines
2012-05-09 01:48:14 -07:00
committed by Android Git Automerger
parent d9155605ab 1d56afc6ac
commit 9d05bd8c67
50 changed files with 960 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1025
api/current.txt
View File

File diff suppressed because it is too large Load Diff

146
graphics/java/android/renderscript/Allocation.java
View File

@@ -27,7 +27,7 @@ import android.graphics.SurfaceTexture;
import android.util.Log;
import android.util.TypedValue;
/** @deprecated renderscript is deprecated in J
/**
* <p>
* Memory allocation class for renderscript. An allocation combines a
* {@link android.renderscript.Type} with the memory to provide storage for user data and objects.
@@ -93,7 +93,7 @@ public class Allocation extends BaseObj {
int mCurrentCount;
/** @deprecated renderscript is deprecated in J
/**
* The usage of the allocation. These signal to renderscript
* where to place the allocation in memory.
*
@@ -102,14 +102,14 @@ public class Allocation extends BaseObj {
*/
public static final int USAGE_SCRIPT = 0x0001;
/** @deprecated renderscript is deprecated in J
/**
* GRAPHICS_TEXTURE The allocation will be used as a texture
* source by one or more graphics programs.
*
*/
public static final int USAGE_GRAPHICS_TEXTURE = 0x0002;
/** @deprecated renderscript is deprecated in J
/**
* GRAPHICS_VERTEX The allocation will be used as a graphics
* mesh.
*
@@ -117,21 +117,21 @@ public class Allocation extends BaseObj {
public static final int USAGE_GRAPHICS_VERTEX = 0x0004;
/** @deprecated renderscript is deprecated in J
/**
* GRAPHICS_CONSTANTS The allocation will be used as the source
* of shader constants by one or more programs.
*
*/
public static final int USAGE_GRAPHICS_CONSTANTS = 0x0008;
/** @deprecated renderscript is deprecated in J
/**
* USAGE_GRAPHICS_RENDER_TARGET The allocation will be used as a
* target for offscreen rendering
*
*/
public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010;
/** @hide renderscript is deprecated in J
/**
* USAGE_IO_INPUT The allocation will be used as SurfaceTexture
* consumer. This usage will cause the allocation to be created
* read only.
@@ -139,7 +139,7 @@ public class Allocation extends BaseObj {
*/
public static final int USAGE_IO_INPUT = 0x0020;
/** @hide renderscript is deprecated in J
/**
* USAGE_IO_OUTPUT The allocation will be used as a
* SurfaceTexture producer. The dimensions and format of the
* SurfaceTexture will be forced to those of the allocation.
@@ -147,25 +147,25 @@ public class Allocation extends BaseObj {
*/
public static final int USAGE_IO_OUTPUT = 0x0040;
/** @deprecated renderscript is deprecated in J
/**
* Controls mipmap behavior when using the bitmap creation and
* update functions.
*/
public enum MipmapControl {
/** @deprecated renderscript is deprecated in J
/**
* No mipmaps will be generated and the type generated from the
* incoming bitmap will not contain additional LODs.
*/
MIPMAP_NONE(0),
/** @deprecated renderscript is deprecated in J
/**
* A Full mipmap chain will be created in script memory. The
* type of the allocation will contain a full mipmap chain. On
* upload to graphics the full chain will be transfered.
*/
MIPMAP_FULL(1),
/** @deprecated renderscript is deprecated in J
/**
* The type of the allocation will be the same as MIPMAP_NONE.
* It will not contain mipmaps. On upload to graphics the
* graphics copy of the allocation data will contain a full
@@ -188,7 +188,7 @@ public class Allocation extends BaseObj {
}
/** @hide renderscript is deprecated in J
/**
* Get the element of the type of the Allocation.
*
* @return Element that describes the structure of data in the
@@ -199,7 +199,7 @@ public class Allocation extends BaseObj {
return mType.getElement();
}
/** @hide renderscript is deprecated in J
/**
* Get the usage flags of the Allocation.
*
* @return usage flags associated with the allocation. e.g.
@@ -210,7 +210,7 @@ public class Allocation extends BaseObj {
return mUsage;
}
/** @hide renderscript is deprecated in J
/**
* Get the size of the Allocation in bytes.
*
* @return size of the Allocation in bytes.
@@ -326,7 +326,7 @@ public class Allocation extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Get the type of the Allocation.
*
* @return Type
@@ -336,7 +336,7 @@ public class Allocation extends BaseObj {
return mType;
}
/** @deprecated renderscript is deprecated in J
/**
* Propagate changes from one usage of the allocation to the
* remaining usages of the allocation.
*
@@ -355,7 +355,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationSyncAll(getIDSafe(), srcLocation);
}
/** @hide renderscript is deprecated in J
/**
* Send a buffer to the output stream. The contents of the
* Allocation will be undefined after this operation.
*
@@ -369,7 +369,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationIoSend(getID(mRS));
}
/** @deprecated renderscript is deprecated in J
/**
* Delete once code is updated.
* @hide
*/
@@ -377,7 +377,7 @@ public class Allocation extends BaseObj {
ioSend();
}
/** @hide renderscript is deprecated in J
/**
* Receive the latest input into the Allocation.
*
*/
@@ -390,7 +390,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationIoReceive(getID(mRS));
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an array of RS objects to the allocation.
*
* @param d Source array.
@@ -461,7 +461,7 @@ public class Allocation extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is not type
* checked which allows an application to fill in structured
* data from an array.
@@ -472,7 +472,7 @@ public class Allocation extends BaseObj {
mRS.validate();
copy1DRangeFromUnchecked(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is not type
* checked which allows an application to fill in structured
* data from an array.
@@ -483,7 +483,7 @@ public class Allocation extends BaseObj {
mRS.validate();
copy1DRangeFromUnchecked(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is not type
* checked which allows an application to fill in structured
* data from an array.
@@ -494,7 +494,7 @@ public class Allocation extends BaseObj {
mRS.validate();
copy1DRangeFromUnchecked(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is not type
* checked which allows an application to fill in structured
* data from an array.
@@ -506,7 +506,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is type
* checked and will generate exceptions if the Allocation type
* is not a 32 bit integer type.
@@ -518,7 +518,7 @@ public class Allocation extends BaseObj {
copy1DRangeFrom(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is type
* checked and will generate exceptions if the Allocation type
* is not a 16 bit integer type.
@@ -530,7 +530,7 @@ public class Allocation extends BaseObj {
copy1DRangeFrom(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is type
* checked and will generate exceptions if the Allocation type
* is not a 8 bit integer type.
@@ -542,7 +542,7 @@ public class Allocation extends BaseObj {
copy1DRangeFrom(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from an array. This variant is type
* checked and will generate exceptions if the Allocation type
* is not a 32 bit float type.
@@ -554,7 +554,7 @@ public class Allocation extends BaseObj {
copy1DRangeFrom(0, mCurrentCount, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy an allocation from a bitmap. The height, width, and
* format of the bitmap must match the existing allocation.
*
@@ -567,7 +567,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationCopyFromBitmap(getID(mRS), b);
}
/** @deprecated renderscript is deprecated in J
/**
* This is only intended to be used by auto-generate code reflected from the
* renderscript script files.
*
@@ -587,7 +587,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(xoff, count, data);
}
/** @deprecated renderscript is deprecated in J
/**
* This is only intended to be used by auto-generate code reflected from the
* renderscript script files.
*
@@ -634,7 +634,7 @@ public class Allocation extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Generate a mipmap chain. Requires the type of the allocation
* include mipmaps.
*
@@ -648,7 +648,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationGenerateMipmaps(getID(mRS));
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* not type checked which allows an application to fill in
* structured data from an array.
@@ -662,7 +662,7 @@ public class Allocation extends BaseObj {
data1DChecks(off, count, d.length * 4, dataSize);
mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* not type checked which allows an application to fill in
* structured data from an array.
@@ -676,7 +676,7 @@ public class Allocation extends BaseObj {
data1DChecks(off, count, d.length * 2, dataSize);
mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* not type checked which allows an application to fill in
* structured data from an array.
@@ -690,7 +690,7 @@ public class Allocation extends BaseObj {
data1DChecks(off, count, d.length, dataSize);
mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* not type checked which allows an application to fill in
* structured data from an array.
@@ -705,7 +705,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* type checked and will generate exceptions if the Allocation
* type is not a 32 bit integer type.
@@ -719,7 +719,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(off, count, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* type checked and will generate exceptions if the Allocation
* type is not a 16 bit integer type.
@@ -733,7 +733,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(off, count, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* type checked and will generate exceptions if the Allocation
* type is not a 8 bit integer type.
@@ -747,7 +747,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(off, count, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from an array. This variant is
* type checked and will generate exceptions if the Allocation
* type is not a 32 bit float type.
@@ -761,7 +761,7 @@ public class Allocation extends BaseObj {
copy1DRangeFromUnchecked(off, count, d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy part of an allocation from another allocation.
*
* @param off The offset of the first element to be copied.
@@ -794,7 +794,7 @@ public class Allocation extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Copy a rectangular region from the array into the allocation.
* The incoming array is assumed to be tightly packed.
*
@@ -811,8 +811,6 @@ public class Allocation extends BaseObj {
w, h, data, data.length);
}
/** @deprecated renderscript is deprecated in J
*/
public void copy2DRangeFrom(int xoff, int yoff, int w, int h, short[] data) {
mRS.validate();
validate2DRange(xoff, yoff, w, h);
@@ -820,8 +818,6 @@ public class Allocation extends BaseObj {
w, h, data, data.length * 2);
}
/** @deprecated renderscript is deprecated in J
*/
public void copy2DRangeFrom(int xoff, int yoff, int w, int h, int[] data) {
mRS.validate();
validate2DRange(xoff, yoff, w, h);
@@ -829,8 +825,6 @@ public class Allocation extends BaseObj {
w, h, data, data.length * 4);
}
/** @deprecated renderscript is deprecated in J
*/
public void copy2DRangeFrom(int xoff, int yoff, int w, int h, float[] data) {
mRS.validate();
validate2DRange(xoff, yoff, w, h);
@@ -838,7 +832,7 @@ public class Allocation extends BaseObj {
w, h, data, data.length * 4);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy a rectangular region into the allocation from another
* allocation.
*
@@ -860,7 +854,7 @@ public class Allocation extends BaseObj {
data.mSelectedLOD, data.mSelectedFace.mID);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy a bitmap into an allocation. The height and width of
* the update will use the height and width of the incoming
* bitmap.
@@ -877,7 +871,7 @@ public class Allocation extends BaseObj {
}
/** @deprecated renderscript is deprecated in J
/**
* Copy from the Allocation into a Bitmap. The bitmap must
* match the dimensions of the Allocation.
*
@@ -890,7 +884,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationCopyToBitmap(getID(mRS), b);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy from the Allocation into a byte array. The array must
* be at least as large as the Allocation. The allocation must
* be of an 8 bit elemental type.
@@ -903,7 +897,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationRead(getID(mRS), d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy from the Allocation into a short array. The array must
* be at least as large as the Allocation. The allocation must
* be of an 16 bit elemental type.
@@ -916,7 +910,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationRead(getID(mRS), d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy from the Allocation into a int array. The array must be
* at least as large as the Allocation. The allocation must be
* of an 32 bit elemental type.
@@ -929,7 +923,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationRead(getID(mRS), d);
}
/** @deprecated renderscript is deprecated in J
/**
* Copy from the Allocation into a float array. The array must
* be at least as large as the Allocation. The allocation must
* be of an 32 bit float elemental type.
@@ -942,7 +936,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationRead(getID(mRS), d);
}
/** @deprecated renderscript is deprecated in J
/**
* Resize a 1D allocation. The contents of the allocation are
* preserved. If new elements are allocated objects are created
* with null contents and the new region is otherwise undefined.
@@ -967,7 +961,7 @@ public class Allocation extends BaseObj {
updateCacheInfo(mType);
}
/** @deprecated renderscript is deprecated in J
/**
* Resize a 2D allocation. The contents of the allocation are
* preserved. If new elements are allocated objects are created
* with null contents and the new region is otherwise undefined.
@@ -1008,7 +1002,7 @@ public class Allocation extends BaseObj {
mBitmapOptions.inScaled = false;
}
/** @deprecated renderscript is deprecated in J
/**
*
* @param type renderscript type describing data layout
* @param mips specifies desired mipmap behaviour for the
@@ -1028,7 +1022,7 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, type, usage);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation with the size specified by
* the type and no mipmaps generated by default
*
@@ -1043,7 +1037,7 @@ public class Allocation extends BaseObj {
return createTyped(rs, type, MipmapControl.MIPMAP_NONE, usage);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation for use by the script with
* the size specified by the type and no mipmaps generated by
* default
@@ -1057,7 +1051,7 @@ public class Allocation extends BaseObj {
return createTyped(rs, type, MipmapControl.MIPMAP_NONE, USAGE_SCRIPT);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation with a specified number of
* given elements
*
@@ -1083,7 +1077,7 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, t, usage);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation with a specified number of
* given elements
*
@@ -1124,7 +1118,7 @@ public class Allocation extends BaseObj {
return tb.create();
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation from a bitmap
*
* @param rs Context to which the allocation will belong.
@@ -1150,7 +1144,7 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, t, usage);
}
/** @deprecated renderscript is deprecated in J
/**
*
*
* @hide
@@ -1168,7 +1162,7 @@ public class Allocation extends BaseObj {
return st;
}
/** @hide renderscript is deprecated in J
/**
* For allocations used with io operations, returns the handle
* onto a raw buffer that is being managed by the screen
* compositor.
@@ -1180,7 +1174,7 @@ public class Allocation extends BaseObj {
return new Surface(getSurfaceTexture());
}
/** @hide renderscript is deprecated in J
/**
* Associate a surface for io output with this allocation
*
* @param sur Surface to associate with allocation
@@ -1194,7 +1188,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationSetSurface(getID(mRS), sur);
}
/** @deprecated renderscript is deprecated in J
/**
* @hide
*/
public void setSurfaceTexture(SurfaceTexture st) {
@@ -1207,7 +1201,7 @@ public class Allocation extends BaseObj {
mRS.nAllocationSetSurface(getID(mRS), s);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a non-mipmapped renderscript allocation to use as a
* graphics texture
*
@@ -1222,7 +1216,7 @@ public class Allocation extends BaseObj {
USAGE_GRAPHICS_TEXTURE);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a cubemap allocation from a bitmap containing the
* horizontal list of cube faces. Each individual face must be
* the same size and power of 2
@@ -1270,7 +1264,7 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, t, usage);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a non-mipmapped cubemap allocation for use as a
* graphics texture from a bitmap containing the horizontal list
* of cube faces. Each individual face must be the same size and
@@ -1289,7 +1283,7 @@ public class Allocation extends BaseObj {
USAGE_GRAPHICS_TEXTURE);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a cubemap allocation from 6 bitmaps containing
* the cube faces. All the faces must be the same size and
* power of 2
@@ -1356,7 +1350,7 @@ public class Allocation extends BaseObj {
return cubemap;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a non-mipmapped cubemap allocation for use as a
* graphics texture from 6 bitmaps containing
* the cube faces. All the faces must be the same size and
@@ -1385,7 +1379,7 @@ public class Allocation extends BaseObj {
USAGE_GRAPHICS_TEXTURE);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation from the bitmap referenced
* by resource id
*
@@ -1413,7 +1407,7 @@ public class Allocation extends BaseObj {
return alloc;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a non-mipmapped renderscript allocation to use as a
* graphics texture from the bitmap referenced by resource id
*
@@ -1432,7 +1426,7 @@ public class Allocation extends BaseObj {
USAGE_GRAPHICS_TEXTURE);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a renderscript allocation containing string data
* encoded in UTF-8 format
*

16
graphics/java/android/renderscript/AllocationAdapter.java
View File

@@ -21,7 +21,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.TypedValue;
/** @deprecated renderscript is deprecated in J
/**
*
**/
public class AllocationAdapter extends Allocation {
@@ -129,7 +129,7 @@ public class AllocationAdapter extends Allocation {
mSelectedZ = 0;
}
/** @deprecated renderscript is deprecated in J
/**
* Set the active LOD. The LOD must be within the range for the
* type being adapted. The base allocation must have mipmaps.
*
@@ -149,7 +149,7 @@ public class AllocationAdapter extends Allocation {
initLOD(lod);
}
/** @deprecated renderscript is deprecated in J
/**
* Set the active Face. The base allocation must be of a type
* that includes faces.
*
@@ -169,7 +169,7 @@ public class AllocationAdapter extends Allocation {
mSelectedFace = cf;
}
/** @deprecated renderscript is deprecated in J
/**
* Set the active Y. The y value must be within the range for
* the allocation being adapted. The base allocation must
* contain the Y dimension.
@@ -190,7 +190,7 @@ public class AllocationAdapter extends Allocation {
mSelectedY = y;
}
/** @deprecated renderscript is deprecated in J
/**
* Set the active Z. The z value must be within the range for
* the allocation being adapted. The base allocation must
* contain the Z dimension.
@@ -211,8 +211,6 @@ public class AllocationAdapter extends Allocation {
mSelectedZ = z;
}
/** @deprecated renderscript is deprecated in J
*/
static public AllocationAdapter create1D(RenderScript rs, Allocation a) {
rs.validate();
AllocationAdapter aa = new AllocationAdapter(0, rs, a);
@@ -224,8 +222,6 @@ public class AllocationAdapter extends Allocation {
return aa;
}
/** @deprecated renderscript is deprecated in J
*/
static public AllocationAdapter create2D(RenderScript rs, Allocation a) {
android.util.Log.e("rs", "create2d " + a);
rs.validate();
@@ -239,7 +235,7 @@ public class AllocationAdapter extends Allocation {
}
/** @deprecated renderscript is deprecated in J
/**
* Override the Allocation resize. Resizing adapters is not
* allowed and will throw a RSInvalidStateException.
*

16
graphics/java/android/renderscript/BaseObj.java
View File

@@ -18,7 +18,7 @@ package android.renderscript;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* 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.
@@ -39,7 +39,7 @@ public class BaseObj {
mID = id;
}
/** @deprecated renderscript is deprecated in J
/**
* Lookup the native object ID for this object. Primarily used by the
* generated reflected code.
*
@@ -73,7 +73,7 @@ public class BaseObj {
private String mName;
RenderScript mRS;
/** @deprecated renderscript is deprecated in J
/**
* setName assigns a name to an object. This object can later be looked up
* by this name. This name will also be retained if the object is written
* to an A3D file.
@@ -103,7 +103,7 @@ public class BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* @return name of the renderscript object
*/
public String getName() {
@@ -124,7 +124,7 @@ public class BaseObj {
super.finalize();
}
/** @deprecated renderscript is deprecated in J
/**
* destroy disconnects the object from the native object effectively
* rendering this java object dead. The primary use is to force immediate
* cleanup of resources when it is believed the GC will not respond quickly
@@ -138,7 +138,7 @@ public class BaseObj {
mRS.nObjDestroy(mID);
}
/** @deprecated renderscript is deprecated in J
/**
* If an object came from an a3d file, java fields need to be
* created with objects from the native layer
*/
@@ -147,7 +147,7 @@ public class BaseObj {
mName = mRS.nGetName(getID(mRS));
}
/** @deprecated renderscript is deprecated in J
/**
* Calculates the hash code value for a BaseObj.
*
* @return int
@@ -157,7 +157,7 @@ public class BaseObj {
return mID;
}
/** @deprecated renderscript is deprecated in J
/**
* Compare the current BaseObj with another BaseObj for equality.
*
* @param obj The object to check equality with.

2
graphics/java/android/renderscript/Byte2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript byte2 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Byte3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript byte3 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Byte4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript byte4 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Double2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript double2 type back
* to the Android system.
*

2
graphics/java/android/renderscript/Double3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript double3 type back
* to the Android system.
*

2
graphics/java/android/renderscript/Double4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript double4 type back
* to the Android system.
*

171
graphics/java/android/renderscript/Element.java
View File

@@ -19,7 +19,7 @@ package android.renderscript;
import java.lang.reflect.Field;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>The most basic data type. An element represents one cell of a memory allocation.
* Element is the basic data type of Renderscript. An element can be of two forms: Basic elements or Complex forms.
* Examples of basic elements are:</p>
@@ -84,12 +84,12 @@ public class Element extends BaseObj {
}
}
/** @hide renderscript is deprecated in J
/**
* @return element size in bytes
*/
public int getBytesSize() {return mSize;}
/** @hide renderscript is deprecated in J
/**
* Returns the number of vector components. 2 for float2, 4 for
* float4, etc.
* @return element vector size
@@ -97,7 +97,7 @@ public class Element extends BaseObj {
public int getVectorSize() {return mVectorSize;}
/** @deprecated renderscript is deprecated in J
/**
* DataType represents the basic type information for a basic element. The
* naming convention follows. For numeric types it is FLOAT,
* SIGNED, or UNSIGNED followed by the _BITS where BITS is the
@@ -114,8 +114,6 @@ public class Element extends BaseObj {
* RS_* objects. 32 bit opaque handles.
*/
public enum DataType {
/** @hide
*/
NONE (0, 0),
//FLOAT_16 (1, 2),
FLOAT_32 (2, 4),
@@ -159,7 +157,7 @@ public class Element extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* The special interpretation of the data if required. This is primarly
* useful for graphical data. USER indicates no special interpretation is
* expected. PIXEL is used in conjunction with the standard data types for
@@ -181,7 +179,7 @@ public class Element extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Return if a element is too complex for use as a data source for a Mesh or
* a Program.
*
@@ -199,7 +197,7 @@ public class Element extends BaseObj {
return false;
}
/** @hide renderscript is deprecated in J
/**
* Elements could be simple, such as an int or a float, or a
* structure with multiple sub elements, such as a collection of
* floats, float2, float4. This function returns zero for simple
@@ -213,7 +211,7 @@ public class Element extends BaseObj {
return mVisibleElementMap.length;
}
/** @hide renderscript is deprecated in J
/**
* For complex elements, this function will return the
* sub-element at index
* @param index index of the sub-element to return
@@ -229,7 +227,7 @@ public class Element extends BaseObj {
return mElements[mVisibleElementMap[index]];
}
/** @hide renderscript is deprecated in J
/**
* For complex elements, this function will return the
* sub-element name at index
* @param index index of the sub-element
@@ -245,7 +243,7 @@ public class Element extends BaseObj {
return mElementNames[mVisibleElementMap[index]];
}
/** @hide renderscript is deprecated in J
/**
* For complex elements, some sub-elements could be statically
* sized arrays. This function will return the array size for
* sub-element at index
@@ -262,7 +260,7 @@ public class Element extends BaseObj {
return mArraySizes[mVisibleElementMap[index]];
}
/** @hide renderscript is deprecated in J
/**
* This function specifies the location of a sub-element within
* the element
* @param index index of the sub-element
@@ -278,21 +276,21 @@ public class Element extends BaseObj {
return mOffsetInBytes[mVisibleElementMap[index]];
}
/** @hide renderscript is deprecated in J
/**
* @return element data type
*/
public DataType getDataType() {
return mType;
}
/** @hide renderscript is deprecated in J
/**
* @return element data kind
*/
public DataKind getDataKind() {
return mKind;
}
/** @deprecated renderscript is deprecated in J
/**
* Utility function for returning an Element containing a single Boolean.
*
* @param rs Context to which the element will belong.
@@ -306,7 +304,7 @@ public class Element extends BaseObj {
return rs.mElement_BOOLEAN;
}
/** @deprecated renderscript is deprecated in J
/**
* Utility function for returning an Element containing a single UNSIGNED_8.
*
* @param rs Context to which the element will belong.
@@ -320,7 +318,7 @@ public class Element extends BaseObj {
return rs.mElement_U8;
}
/** @deprecated renderscript is deprecated in J
/**
* Utility function for returning an Element containing a single SIGNED_8.
*
* @param rs Context to which the element will belong.
@@ -334,8 +332,6 @@ public class Element extends BaseObj {
return rs.mElement_I8;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U16(RenderScript rs) {
if(rs.mElement_U16 == null) {
rs.mElement_U16 = createUser(rs, DataType.UNSIGNED_16);
@@ -343,8 +339,6 @@ public class Element extends BaseObj {
return rs.mElement_U16;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I16(RenderScript rs) {
if(rs.mElement_I16 == null) {
rs.mElement_I16 = createUser(rs, DataType.SIGNED_16);
@@ -352,8 +346,6 @@ public class Element extends BaseObj {
return rs.mElement_I16;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U32(RenderScript rs) {
if(rs.mElement_U32 == null) {
rs.mElement_U32 = createUser(rs, DataType.UNSIGNED_32);
@@ -361,8 +353,6 @@ public class Element extends BaseObj {
return rs.mElement_U32;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I32(RenderScript rs) {
if(rs.mElement_I32 == null) {
rs.mElement_I32 = createUser(rs, DataType.SIGNED_32);
@@ -370,8 +360,6 @@ public class Element extends BaseObj {
return rs.mElement_I32;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U64(RenderScript rs) {
if(rs.mElement_U64 == null) {
rs.mElement_U64 = createUser(rs, DataType.UNSIGNED_64);
@@ -379,8 +367,6 @@ public class Element extends BaseObj {
return rs.mElement_U64;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I64(RenderScript rs) {
if(rs.mElement_I64 == null) {
rs.mElement_I64 = createUser(rs, DataType.SIGNED_64);
@@ -388,8 +374,6 @@ public class Element extends BaseObj {
return rs.mElement_I64;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F32(RenderScript rs) {
if(rs.mElement_F32 == null) {
rs.mElement_F32 = createUser(rs, DataType.FLOAT_32);
@@ -397,8 +381,6 @@ public class Element extends BaseObj {
return rs.mElement_F32;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F64(RenderScript rs) {
if(rs.mElement_F64 == null) {
rs.mElement_F64 = createUser(rs, DataType.FLOAT_64);
@@ -406,8 +388,6 @@ public class Element extends BaseObj {
return rs.mElement_F64;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element ELEMENT(RenderScript rs) {
if(rs.mElement_ELEMENT == null) {
rs.mElement_ELEMENT = createUser(rs, DataType.RS_ELEMENT);
@@ -415,8 +395,6 @@ public class Element extends BaseObj {
return rs.mElement_ELEMENT;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element TYPE(RenderScript rs) {
if(rs.mElement_TYPE == null) {
rs.mElement_TYPE = createUser(rs, DataType.RS_TYPE);
@@ -424,8 +402,6 @@ public class Element extends BaseObj {
return rs.mElement_TYPE;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element ALLOCATION(RenderScript rs) {
if(rs.mElement_ALLOCATION == null) {
rs.mElement_ALLOCATION = createUser(rs, DataType.RS_ALLOCATION);
@@ -433,8 +409,6 @@ public class Element extends BaseObj {
return rs.mElement_ALLOCATION;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element SAMPLER(RenderScript rs) {
if(rs.mElement_SAMPLER == null) {
rs.mElement_SAMPLER = createUser(rs, DataType.RS_SAMPLER);
@@ -442,8 +416,6 @@ public class Element extends BaseObj {
return rs.mElement_SAMPLER;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element SCRIPT(RenderScript rs) {
if(rs.mElement_SCRIPT == null) {
rs.mElement_SCRIPT = createUser(rs, DataType.RS_SCRIPT);
@@ -451,8 +423,6 @@ public class Element extends BaseObj {
return rs.mElement_SCRIPT;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element MESH(RenderScript rs) {
if(rs.mElement_MESH == null) {
rs.mElement_MESH = createUser(rs, DataType.RS_MESH);
@@ -460,8 +430,6 @@ public class Element extends BaseObj {
return rs.mElement_MESH;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element PROGRAM_FRAGMENT(RenderScript rs) {
if(rs.mElement_PROGRAM_FRAGMENT == null) {
rs.mElement_PROGRAM_FRAGMENT = createUser(rs, DataType.RS_PROGRAM_FRAGMENT);
@@ -469,8 +437,6 @@ public class Element extends BaseObj {
return rs.mElement_PROGRAM_FRAGMENT;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element PROGRAM_VERTEX(RenderScript rs) {
if(rs.mElement_PROGRAM_VERTEX == null) {
rs.mElement_PROGRAM_VERTEX = createUser(rs, DataType.RS_PROGRAM_VERTEX);
@@ -478,8 +444,6 @@ public class Element extends BaseObj {
return rs.mElement_PROGRAM_VERTEX;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element PROGRAM_RASTER(RenderScript rs) {
if(rs.mElement_PROGRAM_RASTER == null) {
rs.mElement_PROGRAM_RASTER = createUser(rs, DataType.RS_PROGRAM_RASTER);
@@ -487,8 +451,6 @@ public class Element extends BaseObj {
return rs.mElement_PROGRAM_RASTER;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element PROGRAM_STORE(RenderScript rs) {
if(rs.mElement_PROGRAM_STORE == null) {
rs.mElement_PROGRAM_STORE = createUser(rs, DataType.RS_PROGRAM_STORE);
@@ -496,8 +458,6 @@ public class Element extends BaseObj {
return rs.mElement_PROGRAM_STORE;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element FONT(RenderScript rs) {
if(rs.mElement_FONT == null) {
rs.mElement_FONT = createUser(rs, DataType.RS_FONT);
@@ -505,8 +465,7 @@ public class Element extends BaseObj {
return rs.mElement_FONT;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element A_8(RenderScript rs) {
if(rs.mElement_A_8 == null) {
rs.mElement_A_8 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_A);
@@ -514,8 +473,6 @@ public class Element extends BaseObj {
return rs.mElement_A_8;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element RGB_565(RenderScript rs) {
if(rs.mElement_RGB_565 == null) {
rs.mElement_RGB_565 = createPixel(rs, DataType.UNSIGNED_5_6_5, DataKind.PIXEL_RGB);
@@ -523,8 +480,6 @@ public class Element extends BaseObj {
return rs.mElement_RGB_565;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element RGB_888(RenderScript rs) {
if(rs.mElement_RGB_888 == null) {
rs.mElement_RGB_888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGB);
@@ -532,8 +487,6 @@ public class Element extends BaseObj {
return rs.mElement_RGB_888;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element RGBA_5551(RenderScript rs) {
if(rs.mElement_RGBA_5551 == null) {
rs.mElement_RGBA_5551 = createPixel(rs, DataType.UNSIGNED_5_5_5_1, DataKind.PIXEL_RGBA);
@@ -541,8 +494,6 @@ public class Element extends BaseObj {
return rs.mElement_RGBA_5551;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element RGBA_4444(RenderScript rs) {
if(rs.mElement_RGBA_4444 == null) {
rs.mElement_RGBA_4444 = createPixel(rs, DataType.UNSIGNED_4_4_4_4, DataKind.PIXEL_RGBA);
@@ -550,8 +501,6 @@ public class Element extends BaseObj {
return rs.mElement_RGBA_4444;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element RGBA_8888(RenderScript rs) {
if(rs.mElement_RGBA_8888 == null) {
rs.mElement_RGBA_8888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGBA);
@@ -559,8 +508,6 @@ public class Element extends BaseObj {
return rs.mElement_RGBA_8888;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F32_2(RenderScript rs) {
if(rs.mElement_FLOAT_2 == null) {
rs.mElement_FLOAT_2 = createVector(rs, DataType.FLOAT_32, 2);
@@ -568,8 +515,6 @@ public class Element extends BaseObj {
return rs.mElement_FLOAT_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F32_3(RenderScript rs) {
if(rs.mElement_FLOAT_3 == null) {
rs.mElement_FLOAT_3 = createVector(rs, DataType.FLOAT_32, 3);
@@ -577,8 +522,6 @@ public class Element extends BaseObj {
return rs.mElement_FLOAT_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F32_4(RenderScript rs) {
if(rs.mElement_FLOAT_4 == null) {
rs.mElement_FLOAT_4 = createVector(rs, DataType.FLOAT_32, 4);
@@ -586,8 +529,6 @@ public class Element extends BaseObj {
return rs.mElement_FLOAT_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F64_2(RenderScript rs) {
if(rs.mElement_DOUBLE_2 == null) {
rs.mElement_DOUBLE_2 = createVector(rs, DataType.FLOAT_64, 2);
@@ -595,8 +536,6 @@ public class Element extends BaseObj {
return rs.mElement_DOUBLE_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F64_3(RenderScript rs) {
if(rs.mElement_DOUBLE_3 == null) {
rs.mElement_DOUBLE_3 = createVector(rs, DataType.FLOAT_64, 3);
@@ -604,8 +543,6 @@ public class Element extends BaseObj {
return rs.mElement_DOUBLE_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element F64_4(RenderScript rs) {
if(rs.mElement_DOUBLE_4 == null) {
rs.mElement_DOUBLE_4 = createVector(rs, DataType.FLOAT_64, 4);
@@ -613,8 +550,6 @@ public class Element extends BaseObj {
return rs.mElement_DOUBLE_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U8_2(RenderScript rs) {
if(rs.mElement_UCHAR_2 == null) {
rs.mElement_UCHAR_2 = createVector(rs, DataType.UNSIGNED_8, 2);
@@ -622,8 +557,6 @@ public class Element extends BaseObj {
return rs.mElement_UCHAR_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U8_3(RenderScript rs) {
if(rs.mElement_UCHAR_3 == null) {
rs.mElement_UCHAR_3 = createVector(rs, DataType.UNSIGNED_8, 3);
@@ -631,8 +564,6 @@ public class Element extends BaseObj {
return rs.mElement_UCHAR_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U8_4(RenderScript rs) {
if(rs.mElement_UCHAR_4 == null) {
rs.mElement_UCHAR_4 = createVector(rs, DataType.UNSIGNED_8, 4);
@@ -640,8 +571,6 @@ public class Element extends BaseObj {
return rs.mElement_UCHAR_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I8_2(RenderScript rs) {
if(rs.mElement_CHAR_2 == null) {
rs.mElement_CHAR_2 = createVector(rs, DataType.SIGNED_8, 2);
@@ -649,8 +578,6 @@ public class Element extends BaseObj {
return rs.mElement_CHAR_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I8_3(RenderScript rs) {
if(rs.mElement_CHAR_3 == null) {
rs.mElement_CHAR_3 = createVector(rs, DataType.SIGNED_8, 3);
@@ -658,8 +585,6 @@ public class Element extends BaseObj {
return rs.mElement_CHAR_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I8_4(RenderScript rs) {
if(rs.mElement_CHAR_4 == null) {
rs.mElement_CHAR_4 = createVector(rs, DataType.SIGNED_8, 4);
@@ -667,8 +592,6 @@ public class Element extends BaseObj {
return rs.mElement_CHAR_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U16_2(RenderScript rs) {
if(rs.mElement_USHORT_2 == null) {
rs.mElement_USHORT_2 = createVector(rs, DataType.UNSIGNED_16, 2);
@@ -676,8 +599,6 @@ public class Element extends BaseObj {
return rs.mElement_USHORT_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U16_3(RenderScript rs) {
if(rs.mElement_USHORT_3 == null) {
rs.mElement_USHORT_3 = createVector(rs, DataType.UNSIGNED_16, 3);
@@ -685,8 +606,6 @@ public class Element extends BaseObj {
return rs.mElement_USHORT_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U16_4(RenderScript rs) {
if(rs.mElement_USHORT_4 == null) {
rs.mElement_USHORT_4 = createVector(rs, DataType.UNSIGNED_16, 4);
@@ -694,8 +613,6 @@ public class Element extends BaseObj {
return rs.mElement_USHORT_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I16_2(RenderScript rs) {
if(rs.mElement_SHORT_2 == null) {
rs.mElement_SHORT_2 = createVector(rs, DataType.SIGNED_16, 2);
@@ -703,8 +620,6 @@ public class Element extends BaseObj {
return rs.mElement_SHORT_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I16_3(RenderScript rs) {
if(rs.mElement_SHORT_3 == null) {
rs.mElement_SHORT_3 = createVector(rs, DataType.SIGNED_16, 3);
@@ -712,8 +627,6 @@ public class Element extends BaseObj {
return rs.mElement_SHORT_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I16_4(RenderScript rs) {
if(rs.mElement_SHORT_4 == null) {
rs.mElement_SHORT_4 = createVector(rs, DataType.SIGNED_16, 4);
@@ -721,8 +634,6 @@ public class Element extends BaseObj {
return rs.mElement_SHORT_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U32_2(RenderScript rs) {
if(rs.mElement_UINT_2 == null) {
rs.mElement_UINT_2 = createVector(rs, DataType.UNSIGNED_32, 2);
@@ -730,8 +641,6 @@ public class Element extends BaseObj {
return rs.mElement_UINT_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U32_3(RenderScript rs) {
if(rs.mElement_UINT_3 == null) {
rs.mElement_UINT_3 = createVector(rs, DataType.UNSIGNED_32, 3);
@@ -739,8 +648,6 @@ public class Element extends BaseObj {
return rs.mElement_UINT_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U32_4(RenderScript rs) {
if(rs.mElement_UINT_4 == null) {
rs.mElement_UINT_4 = createVector(rs, DataType.UNSIGNED_32, 4);
@@ -748,8 +655,6 @@ public class Element extends BaseObj {
return rs.mElement_UINT_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I32_2(RenderScript rs) {
if(rs.mElement_INT_2 == null) {
rs.mElement_INT_2 = createVector(rs, DataType.SIGNED_32, 2);
@@ -757,8 +662,6 @@ public class Element extends BaseObj {
return rs.mElement_INT_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I32_3(RenderScript rs) {
if(rs.mElement_INT_3 == null) {
rs.mElement_INT_3 = createVector(rs, DataType.SIGNED_32, 3);
@@ -766,8 +669,6 @@ public class Element extends BaseObj {
return rs.mElement_INT_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I32_4(RenderScript rs) {
if(rs.mElement_INT_4 == null) {
rs.mElement_INT_4 = createVector(rs, DataType.SIGNED_32, 4);
@@ -775,8 +676,6 @@ public class Element extends BaseObj {
return rs.mElement_INT_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U64_2(RenderScript rs) {
if(rs.mElement_ULONG_2 == null) {
rs.mElement_ULONG_2 = createVector(rs, DataType.UNSIGNED_64, 2);
@@ -784,8 +683,6 @@ public class Element extends BaseObj {
return rs.mElement_ULONG_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U64_3(RenderScript rs) {
if(rs.mElement_ULONG_3 == null) {
rs.mElement_ULONG_3 = createVector(rs, DataType.UNSIGNED_64, 3);
@@ -793,8 +690,6 @@ public class Element extends BaseObj {
return rs.mElement_ULONG_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element U64_4(RenderScript rs) {
if(rs.mElement_ULONG_4 == null) {
rs.mElement_ULONG_4 = createVector(rs, DataType.UNSIGNED_64, 4);
@@ -802,8 +697,6 @@ public class Element extends BaseObj {
return rs.mElement_ULONG_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I64_2(RenderScript rs) {
if(rs.mElement_LONG_2 == null) {
rs.mElement_LONG_2 = createVector(rs, DataType.SIGNED_64, 2);
@@ -811,8 +704,6 @@ public class Element extends BaseObj {
return rs.mElement_LONG_2;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I64_3(RenderScript rs) {
if(rs.mElement_LONG_3 == null) {
rs.mElement_LONG_3 = createVector(rs, DataType.SIGNED_64, 3);
@@ -820,8 +711,6 @@ public class Element extends BaseObj {
return rs.mElement_LONG_3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element I64_4(RenderScript rs) {
if(rs.mElement_LONG_4 == null) {
rs.mElement_LONG_4 = createVector(rs, DataType.SIGNED_64, 4);
@@ -829,22 +718,16 @@ public class Element extends BaseObj {
return rs.mElement_LONG_4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element MATRIX_4X4(RenderScript rs) {
if(rs.mElement_MATRIX_4X4 == null) {
rs.mElement_MATRIX_4X4 = createUser(rs, DataType.MATRIX_4X4);
}
return rs.mElement_MATRIX_4X4;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element MATRIX4X4(RenderScript rs) {
return MATRIX_4X4(rs);
}
/** @deprecated renderscript is deprecated in J
*/
public static Element MATRIX_3X3(RenderScript rs) {
if(rs.mElement_MATRIX_3X3 == null) {
rs.mElement_MATRIX_3X3 = createUser(rs, DataType.MATRIX_3X3);
@@ -852,8 +735,6 @@ public class Element extends BaseObj {
return rs.mElement_MATRIX_3X3;
}
/** @deprecated renderscript is deprecated in J
*/
public static Element MATRIX_2X2(RenderScript rs) {
if(rs.mElement_MATRIX_2X2 == null) {
rs.mElement_MATRIX_2X2 = createUser(rs, DataType.MATRIX_2X2);
@@ -943,7 +824,7 @@ public class Element extends BaseObj {
updateVisibleSubElements();
}
/** @deprecated renderscript is deprecated in J
/**
* Create a custom Element of the specified DataType. The DataKind will be
* set to USER and the vector size to 1 indicating non-vector.
*
@@ -959,7 +840,7 @@ public class Element extends BaseObj {
return new Element(id, rs, dt, dk, norm, vecSize);
}
/** @deprecated renderscript is deprecated in J
/**
* Create a custom vector element of the specified DataType and vector size.
* DataKind will be set to USER. Only primitive types (FLOAT_32, FLOAT_64,
* SIGNED_8, SIGNED_16, SIGNED_32, SIGNED_64, UNSIGNED_8, UNSIGNED_16,
@@ -1003,7 +884,7 @@ public class Element extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Create a new pixel Element type. A matching DataType and DataKind must
* be provided. The DataType and DataKind must contain the same number of
* components. Vector size will be set to 1.
@@ -1066,7 +947,7 @@ public class Element extends BaseObj {
return new Element(id, rs, dt, dk, norm, size);
}
/** @deprecated renderscript is deprecated in J
/**
* Check if the current Element is compatible with another Element.
* Primitive Elements are compatible if they share the same underlying
* size and type (i.e. U8 is compatible with A_8). User-defined Elements
@@ -1093,7 +974,7 @@ public class Element extends BaseObj {
(mVectorSize == e.mVectorSize));
}
/** @deprecated renderscript is deprecated in J
/**
* Builder class for producing complex elements with matching field and name
* pairs. The builder starts empty. The order in which elements are added
* is retained for the layout in memory.
@@ -1107,7 +988,7 @@ public class Element extends BaseObj {
int mCount;
int mSkipPadding;
/** @deprecated renderscript is deprecated in J
/**
* Create a builder object.
*
* @param rs
@@ -1120,7 +1001,7 @@ public class Element extends BaseObj {
mArraySizes = new int[8];
}
/** @deprecated renderscript is deprecated in J
/**
* Add an array of elements to this element.
*
* @param element
@@ -1164,7 +1045,7 @@ public class Element extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Add a single element to this Element.
*
* @param element
@@ -1174,7 +1055,7 @@ public class Element extends BaseObj {
return add(element, name, 1);
}
/** @deprecated renderscript is deprecated in J
/**
* Create the element from this builder.
*
*

2
graphics/java/android/renderscript/FieldPacker.java
View File

@@ -17,7 +17,7 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
* Utility class for packing arguments and structures from Android system objects to
* Renderscript objects.
*

30
graphics/java/android/renderscript/FileA3D.java
View File

@@ -27,7 +27,7 @@ import android.graphics.BitmapFactory;
import android.util.Log;
import android.util.TypedValue;
/** @deprecated renderscript is deprecated in J
/**
* FileA3D allows users to load Renderscript objects from files
* or resources stored on disk. It could be used to load items
* such as 3D geometry data converted to a Renderscript format from
@@ -40,17 +40,17 @@ import android.util.TypedValue;
**/
public class FileA3D extends BaseObj {
/** @deprecated renderscript is deprecated in J
/**
* Specifies what renderscript object type is contained within
* the FileA3D IndexEntry
**/
public enum EntryType {
/** @deprecated renderscript is deprecated in J
/**
* Unknown or or invalid object, nothing will be loaded
**/
UNKNOWN (0),
/** @deprecated renderscript is deprecated in J
/**
* Renderscript Mesh object
**/
MESH (1);
@@ -65,7 +65,7 @@ public class FileA3D extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* IndexEntry contains information about one of the Renderscript
* objects inside the file's index. It could be used to query the
* object's type and also name and load the object itself if
@@ -79,7 +79,7 @@ public class FileA3D extends BaseObj {
EntryType mEntryType;
BaseObj mLoadedObj;
/** @deprecated renderscript is deprecated in J
/**
* Returns the name of a renderscript object the index entry
* describes
*
@@ -91,7 +91,7 @@ public class FileA3D extends BaseObj {
return mName;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the type of a renderscript object the index entry
* describes
* @return type of a renderscript object the index entry
@@ -101,7 +101,7 @@ public class FileA3D extends BaseObj {
return mEntryType;
}
/** @deprecated renderscript is deprecated in J
/**
* Used to load the object described by the index entry
* @return base renderscript object described by the entry
*/
@@ -111,7 +111,7 @@ public class FileA3D extends BaseObj {
return obj;
}
/** @deprecated renderscript is deprecated in J
/**
* Used to load the mesh described by the index entry, object
* described by the index entry must be a renderscript mesh
*
@@ -181,7 +181,7 @@ public class FileA3D extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the number of objects stored inside the a3d file
*
* @return the number of objects stored inside the a3d file
@@ -193,7 +193,7 @@ public class FileA3D extends BaseObj {
return mFileEntries.length;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns an index entry from the list of all objects inside
* FileA3D
*
@@ -208,7 +208,7 @@ public class FileA3D extends BaseObj {
return mFileEntries[index];
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a FileA3D object from an asset stored on disk
*
* @param rs Context to which the object will belong.
@@ -229,7 +229,7 @@ public class FileA3D extends BaseObj {
return fa3d;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a FileA3D object from a file stored on disk
*
* @param rs Context to which the object will belong.
@@ -248,7 +248,7 @@ public class FileA3D extends BaseObj {
return fa3d;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a FileA3D object from a file stored on disk
*
* @param rs Context to which the object will belong.
@@ -260,7 +260,7 @@ public class FileA3D extends BaseObj {
return createFromFile(rs, path.getAbsolutePath());
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a FileA3D object from an application resource
*
* @param rs Context to which the object will belong.

2
graphics/java/android/renderscript/Float2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript float2 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Float3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript float2 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Float4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript float2 type back to the Android system.
*
**/

26
graphics/java/android/renderscript/Font.java
View File

@@ -29,8 +29,8 @@ import android.content.res.Resources;
import android.util.Log;
import android.util.TypedValue;
/** @deprecated renderscript is deprecated in J
* <p>This class gives users a simple way to draw hardware accelerated text.
/**
* <p>This class gives users a simple way to draw hardware accelerated text.
* Internally, the glyphs are rendered using the Freetype library and an internal cache of
* rendered glyph bitmaps is maintained. Each font object represents a combination of a typeface,
* and point size. You can create multiple font objects to represent styles such as bold or italic text,
@@ -42,7 +42,7 @@ import android.util.TypedValue;
* render large batches of text in sequence. It is also more efficient to render multiple
* characters at once instead of one by one to improve draw call batching.</p>
* <p>Font color and transparency are not part of the font object and you can freely modify
* them in the script to suit the user's rendering needs. Font colors work as a state machine.
* them in the script to suit the user's rendering needs. Font colors work as a state machine.
* Every new call to draw text uses the last color set in the script.</p>
**/
public class Font extends BaseObj {
@@ -71,20 +71,10 @@ public class Font extends BaseObj {
private static Map<String, FontFamily> sFontFamilyMap;
/** @deprecated renderscript is deprecated in J
*/
public enum Style {
/** @deprecated renderscript is deprecated in J
*/
NORMAL,
/** @deprecated renderscript is deprecated in J
*/
BOLD,
/** @deprecated renderscript is deprecated in J
*/
ITALIC,
/** @deprecated renderscript is deprecated in J
*/
BOLD_ITALIC;
}
@@ -148,7 +138,7 @@ public class Font extends BaseObj {
super(id, rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Takes a specific file name as an argument
*/
static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) {
@@ -164,14 +154,10 @@ public class Font extends BaseObj {
return rsFont;
}
/** @deprecated renderscript is deprecated in J
*/
static public Font createFromFile(RenderScript rs, Resources res, File path, float pointSize) {
return createFromFile(rs, res, path.getAbsolutePath(), pointSize);
}
/** @deprecated renderscript is deprecated in J
*/
static public Font createFromAsset(RenderScript rs, Resources res, String path, float pointSize) {
rs.validate();
AssetManager mgr = res.getAssets();
@@ -185,8 +171,6 @@ public class Font extends BaseObj {
return rsFont;
}
/** @deprecated renderscript is deprecated in J
*/
static public Font createFromResource(RenderScript rs, Resources res, int id, float pointSize) {
String name = "R." + Integer.toString(id);
@@ -215,7 +199,7 @@ public class Font extends BaseObj {
return rsFont;
}
/** @deprecated renderscript is deprecated in J
/**
* Accepts one of the following family names as an argument
* and will attempt to produce the best match with a system font:
*

2
graphics/java/android/renderscript/Int2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript int2 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Int3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript int3 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Int4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript int4 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Long2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript long2 type back to the Android system.
**/
public class Long2 {

2
graphics/java/android/renderscript/Long3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript long3 type back to the Android system.
**/
public class Long3 {

2
graphics/java/android/renderscript/Long4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript long4 type back to the Android system.
**/
public class Long4 {

30
graphics/java/android/renderscript/Matrix2f.java
View File

@@ -20,13 +20,13 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript rs_matrix2x2 type back to the Android system.
*
**/
public class Matrix2f {
/** @deprecated renderscript is deprecated in J
/**
* Creates a new identity 2x2 matrix
*/
public Matrix2f() {
@@ -34,7 +34,7 @@ public class Matrix2f {
loadIdentity();
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a new matrix and sets its values from the given
* parameter
*
@@ -46,7 +46,7 @@ public class Matrix2f {
System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Return a reference to the internal array representing matrix
* values. Modifying this array will also change the matrix
*
@@ -56,7 +56,7 @@ public class Matrix2f {
return mMat;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the value for a given row and column
*
* @param i row of the value to return
@@ -68,7 +68,7 @@ public class Matrix2f {
return mMat[i*2 + j];
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the value for a given row and column
*
* @param i row of the value to set
@@ -78,7 +78,7 @@ public class Matrix2f {
mMat[i*2 + j] = v;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the matrix values to identity
*/
public void loadIdentity() {
@@ -89,7 +89,7 @@ public class Matrix2f {
mMat[3] = 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the values of the matrix to those of the parameter
*
* @param src matrix to load the values from
@@ -98,7 +98,7 @@ public class Matrix2f {
System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a rotation matrix of given angle
*
* @param rot rotation angle
@@ -114,7 +114,7 @@ public class Matrix2f {
mMat[3] = c;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a scale matrix of given dimensions
*
* @param x scale component x
@@ -126,7 +126,7 @@ public class Matrix2f {
mMat[3] = y;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be the result of multiplying two given
* matrices
*
@@ -147,7 +147,7 @@ public class Matrix2f {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Post-multiplies the current matrix by a given parameter
*
* @param rhs right hand side to multiply by
@@ -157,7 +157,7 @@ public class Matrix2f {
tmp.loadMultiply(this, rhs);
load(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* rotation matrix of given angle
*
@@ -168,7 +168,7 @@ public class Matrix2f {
tmp.loadRotate(rot);
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* scale matrix of given dimensions
*
@@ -180,7 +180,7 @@ public class Matrix2f {
tmp.loadScale(x, y);
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the current matrix to its transpose
*/
public void transpose() {

42
graphics/java/android/renderscript/Matrix3f.java
View File

@@ -20,13 +20,13 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript rs_matrix3x3 type back to the Android system.
*
**/
public class Matrix3f {
/** @deprecated renderscript is deprecated in J
/**
* Creates a new identity 3x3 matrix
*/
public Matrix3f() {
@@ -34,7 +34,7 @@ public class Matrix3f {
loadIdentity();
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a new matrix and sets its values from the given
* parameter
*
@@ -46,7 +46,7 @@ public class Matrix3f {
System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Return a reference to the internal array representing matrix
* values. Modifying this array will also change the matrix
*
@@ -56,7 +56,7 @@ public class Matrix3f {
return mMat;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the value for a given row and column
*
* @param i row of the value to return
@@ -68,7 +68,7 @@ public class Matrix3f {
return mMat[i*3 + j];
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the value for a given row and column
*
* @param i row of the value to set
@@ -78,7 +78,7 @@ public class Matrix3f {
mMat[i*3 + j] = v;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the matrix values to identity
*/
public void loadIdentity() {
@@ -95,7 +95,7 @@ public class Matrix3f {
mMat[8] = 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the values of the matrix to those of the parameter
*
* @param src matrix to load the values from
@@ -104,7 +104,7 @@ public class Matrix3f {
System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a rotation matrix of certain angle
* about a given axis
*
@@ -144,7 +144,7 @@ public class Matrix3f {
mMat[8] = z*z*nc + c;
}
/** @deprecated renderscript is deprecated in J
/**
* Makes the upper 2x2 a rotation matrix of the given angle
*
* @param rot rotation angle
@@ -161,7 +161,7 @@ public class Matrix3f {
mMat[4] = c;
}
/** @deprecated renderscript is deprecated in J
/**
* Makes the upper 2x2 a scale matrix of given dimensions
*
* @param x scale component x
@@ -173,7 +173,7 @@ public class Matrix3f {
mMat[4] = y;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a scale matrix of given dimensions
*
* @param x scale component x
@@ -187,7 +187,7 @@ public class Matrix3f {
mMat[8] = z;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a translation matrix of given
* dimensions
*
@@ -200,7 +200,7 @@ public class Matrix3f {
mMat[7] = y;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be the result of multiplying two given
* matrices
*
@@ -224,7 +224,7 @@ public class Matrix3f {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Post-multiplies the current matrix by a given parameter
*
* @param rhs right hand side to multiply by
@@ -235,7 +235,7 @@ public class Matrix3f {
load(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* rotation matrix of certain angle about a given axis
*
@@ -250,7 +250,7 @@ public class Matrix3f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the upper 2x2 of the current matrix by
* post-multiplying it with a rotation matrix of given angle
*
@@ -262,7 +262,7 @@ public class Matrix3f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the upper 2x2 of the current matrix by
* post-multiplying it with a scale matrix of given dimensions
*
@@ -275,7 +275,7 @@ public class Matrix3f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* scale matrix of given dimensions
*
@@ -289,7 +289,7 @@ public class Matrix3f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* translation matrix of given dimensions
*
@@ -302,7 +302,7 @@ public class Matrix3f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the current matrix to its transpose
*/
public void transpose() {

48
graphics/java/android/renderscript/Matrix4f.java
View File

@@ -20,13 +20,13 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript rs_matrix4x4 type back to the Android system.
*
**/
public class Matrix4f {
/** @deprecated renderscript is deprecated in J
/**
* Creates a new identity 4x4 matrix
*/
public Matrix4f() {
@@ -34,7 +34,7 @@ public class Matrix4f {
loadIdentity();
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a new matrix and sets its values from the given
* parameter
*
@@ -46,7 +46,7 @@ public class Matrix4f {
System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Return a reference to the internal array representing matrix
* values. Modifying this array will also change the matrix
*
@@ -56,7 +56,7 @@ public class Matrix4f {
return mMat;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the value for a given row and column
*
* @param i row of the value to return
@@ -68,7 +68,7 @@ public class Matrix4f {
return mMat[i*4 + j];
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the value for a given row and column
*
* @param i row of the value to set
@@ -78,7 +78,7 @@ public class Matrix4f {
mMat[i*4 + j] = v;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the matrix values to identity
*/
public void loadIdentity() {
@@ -103,7 +103,7 @@ public class Matrix4f {
mMat[15] = 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the values of the matrix to those of the parameter
*
* @param src matrix to load the values from
@@ -112,7 +112,7 @@ public class Matrix4f {
System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a rotation matrix of certain angle
* about a given axis
*
@@ -159,7 +159,7 @@ public class Matrix4f {
mMat[10] = z*z*nc + c;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a scale matrix of given dimensions
*
* @param x scale component x
@@ -173,7 +173,7 @@ public class Matrix4f {
mMat[10] = z;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a translation matrix of given
* dimensions
*
@@ -188,7 +188,7 @@ public class Matrix4f {
mMat[14] = z;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be the result of multiplying two given
* matrices
*
@@ -215,7 +215,7 @@ public class Matrix4f {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Set current values to be an orthographic projection matrix
*
* @param l location of the left vertical clipping plane
@@ -235,7 +235,7 @@ public class Matrix4f {
mMat[14]= -(f + n) / (f - n);
}
/** @deprecated renderscript is deprecated in J
/**
* Set current values to be an orthographic projection matrix
* with the right and bottom clipping planes set to the given
* values. Left and top clipping planes are set to 0. Near and
@@ -249,7 +249,7 @@ public class Matrix4f {
loadOrtho(0,w, h,0, -1,1);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a perspective projection matrix
*
* @param l location of the left vertical clipping plane
@@ -272,7 +272,7 @@ public class Matrix4f {
mMat[15]= 0;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets current values to be a perspective projection matrix
*
* @param fovy vertical field of view angle in degrees
@@ -288,7 +288,7 @@ public class Matrix4f {
loadFrustum(left, right, bottom, top, near, far);
}
/** @deprecated renderscript is deprecated in J
/**
* Helper function to set the current values to a perspective
* projection matrix with aspect ratio defined by the parameters
* and (near, far), (bottom, top) mapping to (-1, 1) at z = 0
@@ -321,7 +321,7 @@ public class Matrix4f {
load(m1);
}
/** @deprecated renderscript is deprecated in J
/**
* Post-multiplies the current matrix by a given parameter
*
* @param rhs right hand side to multiply by
@@ -331,7 +331,7 @@ public class Matrix4f {
tmp.loadMultiply(this, rhs);
load(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* rotation matrix of certain angle about a given axis
*
@@ -346,7 +346,7 @@ public class Matrix4f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* scale matrix of given dimensions
*
@@ -360,7 +360,7 @@ public class Matrix4f {
multiply(tmp);
}
/** @deprecated renderscript is deprecated in J
/**
* Modifies the current matrix by post-multiplying it with a
* translation matrix of given dimensions
*
@@ -392,7 +392,7 @@ public class Matrix4f {
return cofactor;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the current matrix to its inverse
*/
public boolean inverse() {
@@ -421,7 +421,7 @@ public class Matrix4f {
return true;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the current matrix to its inverse transpose
*/
public boolean inverseTranspose() {
@@ -449,7 +449,7 @@ public class Matrix4f {
return true;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the current matrix to its transpose
*/
public void transpose() {

86
graphics/java/android/renderscript/Mesh.java
View File

@@ -20,7 +20,7 @@ import java.util.Vector;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>This class is a container for geometric data displayed with
* Renderscript. Internally, a mesh is a collection of allocations that
* represent vertex data (positions, normals, texture
@@ -39,34 +39,34 @@ import android.util.Log;
**/
public class Mesh extends BaseObj {
/** @deprecated renderscript is deprecated in J
/**
* Describes the way mesh vertex data is interpreted when rendering
*
**/
public enum Primitive {
/** @deprecated renderscript is deprecated in J
/**
* Vertex data will be rendered as a series of points
*/
POINT (0),
/** @deprecated renderscript is deprecated in J
/**
* Vertex pairs will be rendered as lines
*/
LINE (1),
/** @deprecated renderscript is deprecated in J
/**
* Vertex data will be rendered as a connected line strip
*/
LINE_STRIP (2),
/** @deprecated renderscript is deprecated in J
/**
* Vertices will be rendered as individual triangles
*/
TRIANGLE (3),
/** @deprecated renderscript is deprecated in J
/**
* Vertices will be rendered as a connected triangle strip
* defined by the first three vertices with each additional
* triangle defined by a new vertex
*/
TRIANGLE_STRIP (4),
/** @deprecated renderscript is deprecated in J
/**
* Vertices will be rendered as a sequence of triangles that all
* share first vertex as the origin
*/
@@ -86,7 +86,7 @@ public class Mesh extends BaseObj {
super(id, rs);
}
/** @deprecated renderscript is deprecated in J
/**
* @return number of allocations containing vertex data
*
**/
@@ -96,7 +96,7 @@ public class Mesh extends BaseObj {
}
return mVertexBuffers.length;
}
/** @deprecated renderscript is deprecated in J
/**
* @param slot index in the list of allocations to return
* @return vertex data allocation at the given index
*
@@ -105,7 +105,7 @@ public class Mesh extends BaseObj {
return mVertexBuffers[slot];
}
/** @deprecated renderscript is deprecated in J
/**
* @return number of primitives or index sets in the mesh
*
**/
@@ -116,7 +116,7 @@ public class Mesh extends BaseObj {
return mIndexBuffers.length;
}
/** @deprecated renderscript is deprecated in J
/**
* @param slot locaton within the list of index set allocation
* @return allocation containing primtive index data or null if
* the index data is not specified explicitly
@@ -125,7 +125,7 @@ public class Mesh extends BaseObj {
public Allocation getIndexSetAllocation(int slot) {
return mIndexBuffers[slot];
}
/** @deprecated renderscript is deprecated in J
/**
* @param slot locaiton within the list of index set primitives
* @return index set primitive type
*
@@ -167,7 +167,7 @@ public class Mesh extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Mesh builder object. It starts empty and requires you to
* add the types necessary to create vertex and index
* allocations.
@@ -189,7 +189,7 @@ public class Mesh extends BaseObj {
Entry[] mVertexTypes;
Vector mIndexTypes;
/** @deprecated renderscript is deprecated in J
/**
* Creates builder object
* @param rs Context to which the mesh will belong.
* @param usage specifies how the mesh allocations are to be
@@ -204,7 +204,7 @@ public class Mesh extends BaseObj {
mIndexTypes = new Vector();
}
/** @deprecated renderscript is deprecated in J
/**
* @return internal index of the last vertex buffer type added to
* builder
**/
@@ -212,7 +212,7 @@ public class Mesh extends BaseObj {
return mVertexTypeCount - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* @return internal index of the last index set added to the
* builder
**/
@@ -220,7 +220,7 @@ public class Mesh extends BaseObj {
return mIndexTypes.size() - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a vertex data type to the builder object
*
* @param t type of the vertex data allocation to be created
@@ -239,7 +239,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a vertex data type to the builder object
*
* @param e element describing the vertex data layout
@@ -260,7 +260,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an index set data type to the builder object
*
* @param t type of the index set data, could be null
@@ -278,7 +278,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an index set primitive type to the builder object
*
* @param p primitive type
@@ -295,7 +295,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an index set data type to the builder object
*
* @param e element describing the index set data layout
@@ -320,7 +320,7 @@ public class Mesh extends BaseObj {
return tb.create();
}
/** @deprecated renderscript is deprecated in J
/**
* Create a Mesh object from the current state of the builder
*
**/
@@ -372,7 +372,7 @@ public class Mesh extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Mesh builder object. It starts empty and requires the user to
* add all the vertex and index allocations that comprise the
* mesh
@@ -391,8 +391,6 @@ public class Mesh extends BaseObj {
Vector mIndexTypes;
/** @deprecated renderscript is deprecated in J
*/
public AllocationBuilder(RenderScript rs) {
mRS = rs;
mVertexTypeCount = 0;
@@ -400,7 +398,7 @@ public class Mesh extends BaseObj {
mIndexTypes = new Vector();
}
/** @deprecated renderscript is deprecated in J
/**
* @return internal index of the last vertex buffer type added to
* builder
**/
@@ -408,7 +406,7 @@ public class Mesh extends BaseObj {
return mVertexTypeCount - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* @return internal index of the last index set added to the
* builder
**/
@@ -416,7 +414,7 @@ public class Mesh extends BaseObj {
return mIndexTypes.size() - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an allocation containing vertex buffer data to the
* builder
*
@@ -435,7 +433,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an allocation containing index buffer data and index type
* to the builder
*
@@ -452,7 +450,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds an index set type to the builder
*
* @param p index set primitive type
@@ -467,7 +465,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Create a Mesh object from the current state of the builder
*
**/
@@ -508,7 +506,7 @@ public class Mesh extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Builder that allows creation of a mesh object point by point
* and triangle by triangle
*
@@ -535,17 +533,11 @@ public class Mesh extends BaseObj {
int mVtxSize;
int mFlags;
/** @deprecated renderscript is deprecated in J
*/
public static final int COLOR = 0x0001;
/** @deprecated renderscript is deprecated in J
*/
public static final int NORMAL = 0x0002;
/** @deprecated renderscript is deprecated in J
*/
public static final int TEXTURE_0 = 0x0100;
/** @deprecated renderscript is deprecated in J
/**
* @param rs Context to which the mesh will belong.
* @param vtxSize specifies whether the vertex is a float2 or
* float3
@@ -600,7 +592,7 @@ public class Mesh extends BaseObj {
mMaxIndex ++;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a float2 vertex to the mesh
*
* @param x position x
@@ -620,7 +612,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a float3 vertex to the mesh
*
* @param x position x
@@ -643,7 +635,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the texture coordinate for the vertices that are added after this method call.
*
* @param s texture coordinate s
@@ -660,7 +652,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the normal vector for the vertices that are added after this method call.
*
* @param x normal vector x
@@ -679,7 +671,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the color for the vertices that are added after this method call.
*
* @param r red component
@@ -700,7 +692,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a new triangle to the mesh builder
*
* @param idx1 index of the first vertex in the triangle
@@ -726,7 +718,7 @@ public class Mesh extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates the mesh object from the current state of the builder
*
* @param uploadToBufferObject specifies whether the vertex data

2
graphics/java/android/renderscript/Path.java
View File

@@ -19,7 +19,7 @@ package android.renderscript;
import java.util.Vector;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* @hide
*
*/

43
graphics/java/android/renderscript/Program.java
View File

@@ -25,7 +25,7 @@ import android.content.res.Resources;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
*
* Program is a base class for all the objects that modify
* various stages of the graphics pipeline
@@ -37,18 +37,14 @@ public class Program extends BaseObj {
static final int MAX_CONSTANT = 8;
static final int MAX_TEXTURE = 8;
/** @deprecated renderscript is deprecated in J
/**
*
* TextureType specifies what textures are attached to Program
* objects
*
**/
public enum TextureType {
/** @deprecated renderscript is deprecated in J
*/
TEXTURE_2D (0),
/** @deprecated renderscript is deprecated in J
*/
TEXTURE_CUBE (1);
int mID;
@@ -81,7 +77,7 @@ public class Program extends BaseObj {
super(id, rs);
}
/** @hide renderscript is deprecated in J
/**
* Program object can have zero or more constant allocations
* associated with it. This method returns the total count.
* @return number of constant input types
@@ -90,7 +86,7 @@ public class Program extends BaseObj {
return mConstants != null ? mConstants.length : 0;
}
/** @hide renderscript is deprecated in J
/**
* Returns the type of the constant buffer used in the program
* object. It could be used to query internal elements or create
* an allocation to store constant data.
@@ -104,7 +100,7 @@ public class Program extends BaseObj {
return mConstants[slot];
}
/** @hide renderscript is deprecated in J
/**
* Returns the number of textures used in this program object
* @return number of texture inputs
*/
@@ -112,7 +108,7 @@ public class Program extends BaseObj {
return mTextureCount;
}
/** @hide renderscript is deprecated in J
/**
* Returns the type of texture at a given slot. e.g. 2D or Cube
* @param slot index of the texture input
* @return texture input type
@@ -124,7 +120,7 @@ public class Program extends BaseObj {
return mTextures[slot];
}
/** @hide renderscript is deprecated in J
/**
* Returns the name of the texture input at a given slot. e.g.
* tex0, diffuse, spec
* @param slot index of the texture input
@@ -137,7 +133,7 @@ public class Program extends BaseObj {
return mTextureNames[slot];
}
/** @deprecated renderscript is deprecated in J
/**
* Binds a constant buffer to be used as uniform inputs to the
* program
*
@@ -157,7 +153,7 @@ public class Program extends BaseObj {
mRS.nProgramBindConstants(getID(mRS), slot, id);
}
/** @deprecated renderscript is deprecated in J
/**
* Binds a texture to be used in the program
*
* @param va allocation containing texture data
@@ -179,7 +175,7 @@ public class Program extends BaseObj {
mRS.nProgramBindTexture(getID(mRS), slot, id);
}
/** @deprecated renderscript is deprecated in J
/**
* Binds an object that describes how a texture at the
* corresponding location is sampled
*
@@ -214,8 +210,7 @@ public class Program extends BaseObj {
int mTextureCount;
String mShader;
/** @deprecated renderscript is deprecated in J
*/
protected BaseProgramBuilder(RenderScript rs) {
mRS = rs;
mInputs = new Element[MAX_INPUT];
@@ -229,7 +224,7 @@ public class Program extends BaseObj {
mTextureNames = new String[MAX_TEXTURE];
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the GLSL shader code to be used in the program
*
* @param s GLSL shader string
@@ -240,7 +235,7 @@ public class Program extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the GLSL shader code to be used in the program
*
* @param resources application resources
@@ -286,7 +281,7 @@ public class Program extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Queries the index of the last added constant buffer type
*
*/
@@ -294,7 +289,7 @@ public class Program extends BaseObj {
return mConstantCount - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Queries the index of the last added texture type
*
*/
@@ -302,7 +297,7 @@ public class Program extends BaseObj {
return mTextureCount - 1;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds constant (uniform) inputs to the program
*
* @param t Type that describes the layout of the Allocation
@@ -322,7 +317,7 @@ public class Program extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a texture input to the Program
*
* @param texType describes that the texture to append it (2D,
@@ -334,7 +329,7 @@ public class Program extends BaseObj {
return this;
}
/** @hide renderscript is deprecated in J
/**
* Adds a texture input to the Program
*
* @param texType describes that the texture to append it (2D,
@@ -354,8 +349,6 @@ public class Program extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
*/
protected void initProgram(Program p) {
p.mInputs = new Element[mInputCount];
System.arraycopy(mInputs, 0, p.mInputs, 0, mInputCount);

6
graphics/java/android/renderscript/ProgramFragment.java
View File

@@ -20,7 +20,7 @@ package android.renderscript;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>The Renderscript fragment program, also known as fragment shader is responsible
* for manipulating pixel data in a user defined way. It's constructed from a GLSL
* shader string containing the program body, textures inputs, and a Type object
@@ -42,7 +42,7 @@ public class ProgramFragment extends Program {
}
public static class Builder extends BaseProgramBuilder {
/** @deprecated renderscript is deprecated in J
/**
* Create a builder object.
*
* @param rs Context to which the program will belong.
@@ -51,7 +51,7 @@ public class ProgramFragment extends Program {
super(rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates ProgramFragment from the current state of the builder
*
* @return ProgramFragment

34
graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
View File

@@ -20,7 +20,7 @@ package android.renderscript;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>ProgramFragmentFixedFunction is a helper class that provides
* a way to make a simple fragment shader without writing any
* GLSL code. This class allows for display of constant color, interpolated
@@ -38,7 +38,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
super(rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Creates ProgramFragmentFixedFunction from the current state
* of the builder
*
@@ -76,8 +76,6 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
}
public static class Builder {
/** @deprecated renderscript is deprecated in J
*/
public static final int MAX_TEXTURE = 2;
int mNumTextures;
boolean mPointSpriteEnable;
@@ -85,20 +83,14 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
String mShader;
RenderScript mRS;
/** @deprecated renderscript is deprecated in J
/**
* EnvMode describes how textures are combined with the existing
* color in the fixed function fragment shader
*
**/
public enum EnvMode {
/** @deprecated renderscript is deprecated in J
*/
REPLACE (1),
/** @deprecated renderscript is deprecated in J
*/
MODULATE (2),
/** @deprecated renderscript is deprecated in J
*/
DECAL (3);
int mID;
@@ -107,23 +99,15 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Format describes the pixel format of textures in the fixed
* function fragment shader and how they are sampled
*
**/
public enum Format {
/** @deprecated renderscript is deprecated in J
*/
ALPHA (1),
/** @deprecated renderscript is deprecated in J
*/
LUMINANCE_ALPHA (2),
/** @deprecated renderscript is deprecated in J
*/
RGB (3),
/** @deprecated renderscript is deprecated in J
*/
RGBA (4);
int mID;
@@ -206,7 +190,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
mShader += "}\n";
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a builder for fixed function fragment program
*
* @param rs Context to which the program will belong.
@@ -217,7 +201,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
mPointSpriteEnable = false;
}
/** @deprecated renderscript is deprecated in J
/**
* Adds a texture to be fetched as part of the fixed function
* fragment program
*
@@ -239,7 +223,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies whether the texture coordinate passed from the
* vertex program is replaced with an openGL internal point
* sprite texture coordinate
@@ -250,7 +234,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies whether the varying color passed from the vertex
* program or the constant color set on the fragment program is
* used in the final color calculation in the fixed function
@@ -262,7 +246,7 @@ public class ProgramFragmentFixedFunction extends ProgramFragment {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates the fixed function fragment program from the current
* state of the builder.
*

30
graphics/java/android/renderscript/ProgramRaster.java
View File

@@ -20,23 +20,15 @@ package android.renderscript;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Program raster is primarily used to specify whether point sprites are enabled and to control
* the culling mode. By default, back faces are culled.
**/
public class ProgramRaster extends BaseObj {
/** @deprecated renderscript is deprecated in J
*/
public enum CullMode {
/** @deprecated renderscript is deprecated in J
*/
BACK (0),
/** @deprecated renderscript is deprecated in J
*/
FRONT (1),
/** @deprecated renderscript is deprecated in J
*/
NONE (2);
int mID;
@@ -55,7 +47,7 @@ public class ProgramRaster extends BaseObj {
mCullMode = CullMode.BACK;
}
/** @hide renderscript is deprecated in J
/**
* Specifies whether vertices are rendered as screen aligned
* elements of a specified size
* @return whether point sprites are enabled
@@ -64,7 +56,7 @@ public class ProgramRaster extends BaseObj {
return mPointSprite;
}
/** @hide renderscript is deprecated in J
/**
* Specifies how triangles are culled based on their orientation
* @return cull mode
*/
@@ -72,8 +64,6 @@ public class ProgramRaster extends BaseObj {
return mCullMode;
}
/** @deprecated renderscript is deprecated in J
*/
public static ProgramRaster CULL_BACK(RenderScript rs) {
if(rs.mProgramRaster_CULL_BACK == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -83,8 +73,6 @@ public class ProgramRaster extends BaseObj {
return rs.mProgramRaster_CULL_BACK;
}
/** @deprecated renderscript is deprecated in J
*/
public static ProgramRaster CULL_FRONT(RenderScript rs) {
if(rs.mProgramRaster_CULL_FRONT == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -94,8 +82,6 @@ public class ProgramRaster extends BaseObj {
return rs.mProgramRaster_CULL_FRONT;
}
/** @deprecated renderscript is deprecated in J
*/
public static ProgramRaster CULL_NONE(RenderScript rs) {
if(rs.mProgramRaster_CULL_NONE == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -105,37 +91,27 @@ public class ProgramRaster extends BaseObj {
return rs.mProgramRaster_CULL_NONE;
}
/** @deprecated renderscript is deprecated in J
*/
public static class Builder {
RenderScript mRS;
boolean mPointSprite;
CullMode mCullMode;
/** @deprecated renderscript is deprecated in J
*/
public Builder(RenderScript rs) {
mRS = rs;
mPointSprite = false;
mCullMode = CullMode.BACK;
}
/** @deprecated renderscript is deprecated in J
*/
public Builder setPointSpriteEnabled(boolean enable) {
mPointSprite = enable;
return this;
}
/** @deprecated renderscript is deprecated in J
*/
public Builder setCullMode(CullMode m) {
mCullMode = m;
return this;
}
/** @deprecated renderscript is deprecated in J
*/
public ProgramRaster create() {
mRS.validate();
int id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID);

96
graphics/java/android/renderscript/ProgramStore.java
View File

@@ -20,7 +20,7 @@ package android.renderscript;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>ProgramStore contains a set of parameters that control how
* the graphics hardware handles writes to the framebuffer.
* It could be used to:</p>
@@ -35,7 +35,7 @@ import android.util.Log;
*
**/
public class ProgramStore extends BaseObj {
/** @deprecated renderscript is deprecated in J
/**
* Specifies the function used to determine whether a fragment
* will be drawn during the depth testing stage in the rendering
* pipeline by comparing its value with that already in the depth
@@ -44,36 +44,36 @@ public class ProgramStore extends BaseObj {
*/
public enum DepthFunc {
/** @deprecated renderscript is deprecated in J
/**
* Always drawn
*/
ALWAYS (0),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is less than that in the
* depth buffer
*/
LESS (1),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is less or equal to that in
* the depth buffer
*/
LESS_OR_EQUAL (2),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is greater than that in the
* depth buffer
*/
GREATER (3),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is greater or equal to that
* in the depth buffer
*/
GREATER_OR_EQUAL (4),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is equal to that in the
* depth buffer
*/
EQUAL (5),
/** @deprecated renderscript is deprecated in J
/**
* Drawn if the incoming depth value is not equal to that in the
* depth buffer
*/
@@ -85,7 +85,7 @@ public class ProgramStore extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies the functions used to combine incoming pixels with
* those already in the frame buffer.
*
@@ -94,32 +94,14 @@ public class ProgramStore extends BaseObj {
*
*/
public enum BlendSrcFunc {
/** @deprecated renderscript is deprecated in J
*/
ZERO (0),
/** @deprecated renderscript is deprecated in J
*/
ONE (1),
/** @deprecated renderscript is deprecated in J
*/
DST_COLOR (2),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_DST_COLOR (3),
/** @deprecated renderscript is deprecated in J
*/
SRC_ALPHA (4),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_SRC_ALPHA (5),
/** @deprecated renderscript is deprecated in J
*/
DST_ALPHA (6),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_DST_ALPHA (7),
/** @deprecated renderscript is deprecated in J
*/
SRC_ALPHA_SATURATE (8);
int mID;
@@ -128,7 +110,7 @@ public class ProgramStore extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies the functions used to combine incoming pixels with
* those already in the frame buffer.
*
@@ -138,29 +120,13 @@ public class ProgramStore extends BaseObj {
*
*/
public enum BlendDstFunc {
/** @deprecated renderscript is deprecated in J
*/
ZERO (0),
/** @deprecated renderscript is deprecated in J
*/
ONE (1),
/** @deprecated renderscript is deprecated in J
*/
SRC_COLOR (2),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_SRC_COLOR (3),
/** @deprecated renderscript is deprecated in J
*/
SRC_ALPHA (4),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_SRC_ALPHA (5),
/** @deprecated renderscript is deprecated in J
*/
DST_ALPHA (6),
/** @deprecated renderscript is deprecated in J
*/
ONE_MINUS_DST_ALPHA (7);
int mID;
@@ -183,7 +149,7 @@ public class ProgramStore extends BaseObj {
super(id, rs);
}
/** @hide renderscript is deprecated in J
/**
* Returns the function used to test writing into the depth
* buffer
* @return depth function
@@ -192,7 +158,7 @@ public class ProgramStore extends BaseObj {
return mDepthFunc;
}
/** @hide renderscript is deprecated in J
/**
* Queries whether writes are enabled into the depth buffer
* @return depth mask
*/
@@ -200,7 +166,7 @@ public class ProgramStore extends BaseObj {
return mDepthMask;
}
/** @hide renderscript is deprecated in J
/**
* Queries whether red channel is written
* @return red color channel mask
*/
@@ -208,7 +174,7 @@ public class ProgramStore extends BaseObj {
return mColorMaskR;
}
/** @hide renderscript is deprecated in J
/**
* Queries whether green channel is written
* @return green color channel mask
*/
@@ -216,7 +182,7 @@ public class ProgramStore extends BaseObj {
return mColorMaskG;
}
/** @hide renderscript is deprecated in J
/**
* Queries whether blue channel is written
* @return blue color channel mask
*/
@@ -224,7 +190,7 @@ public class ProgramStore extends BaseObj {
return mColorMaskB;
}
/** @hide renderscript is deprecated in J
/**
* Queries whether alpha channel is written
* @return alpha channel mask
*/
@@ -232,7 +198,7 @@ public class ProgramStore extends BaseObj {
return mColorMaskA;
}
/** @hide renderscript is deprecated in J
/**
* Specifies how the source blending factor is computed
* @return source blend function
*/
@@ -240,7 +206,7 @@ public class ProgramStore extends BaseObj {
return mBlendSrc;
}
/** @hide renderscript is deprecated in J
/**
* Specifies how the destination blending factor is computed
* @return destination blend function
*/
@@ -248,7 +214,7 @@ public class ProgramStore extends BaseObj {
return mBlendDst;
}
/** @hide renderscript is deprecated in J
/**
* Specifies whether colors are dithered before writing into the
* framebuffer
* @return whether dither is enabled
@@ -257,7 +223,7 @@ public class ProgramStore extends BaseObj {
return mDither;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns a pre-defined program store object with the following
* characteristics:
* - incoming pixels are drawn if their depth value is less than
@@ -279,7 +245,7 @@ public class ProgramStore extends BaseObj {
}
return rs.mProgramStore_BLEND_NONE_DEPTH_TEST;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns a pre-defined program store object with the following
* characteristics:
* - incoming pixels always pass the depth test and their value
@@ -300,7 +266,7 @@ public class ProgramStore extends BaseObj {
}
return rs.mProgramStore_BLEND_NONE_DEPTH_NO_DEPTH;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns a pre-defined program store object with the following
* characteristics:
* - incoming pixels are drawn if their depth value is less than
@@ -324,7 +290,7 @@ public class ProgramStore extends BaseObj {
}
return rs.mProgramStore_BLEND_ALPHA_DEPTH_TEST;
}
/** @deprecated renderscript is deprecated in J
/**
* Returns a pre-defined program store object with the following
* characteristics:
* - incoming pixels always pass the depth test and their value
@@ -347,7 +313,7 @@ public class ProgramStore extends BaseObj {
return rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH;
}
/** @deprecated renderscript is deprecated in J
/**
* Builder class for ProgramStore object. If the builder is left
* empty, the equivalent of BLEND_NONE_DEPTH_NONE would be
* returned
@@ -376,7 +342,7 @@ public class ProgramStore extends BaseObj {
mBlendDst = BlendDstFunc.ZERO;
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies the depth testing behavior
*
* @param func function used for depth testing
@@ -388,7 +354,7 @@ public class ProgramStore extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Enables writes into the depth buffer
*
* @param enable specifies whether depth writes are
@@ -401,7 +367,7 @@ public class ProgramStore extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Enables writes into the color buffer
*
* @param r specifies whether red channel is written
@@ -419,7 +385,7 @@ public class ProgramStore extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies how incoming pixels are combined with the pixels
* stored in the framebuffer
*
@@ -436,7 +402,7 @@ public class ProgramStore extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Enables dithering
*
* @param enable specifies whether dithering is enabled or
@@ -449,7 +415,7 @@ public class ProgramStore extends BaseObj {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates a program store from the current state of the builder
*/
public ProgramStore create() {

16
graphics/java/android/renderscript/ProgramVertex.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
/** @deprecated renderscript is deprecated in J
/**
* <p>The Renderscript vertex program, also known as a vertex shader, describes a stage in
* the graphics pipeline responsible for manipulating geometric data in a user-defined way.
* The object is constructed by providing the Renderscript system with the following data:</p>
@@ -42,7 +42,7 @@ import android.graphics.Matrix;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* ProgramVertex, also know as a vertex shader, describes a
* stage in the graphics pipeline responsible for manipulating
* geometric data in a user-defined way.
@@ -54,14 +54,14 @@ public class ProgramVertex extends Program {
super(id, rs);
}
/** @hide renderscript is deprecated in J
/**
* @return number of input attribute elements
*/
public int getInputCount() {
return mInputs != null ? mInputs.length : 0;
}
/** @hide renderscript is deprecated in J
/**
* @param slot location of the input to return
* @return input attribute element
*/
@@ -72,7 +72,7 @@ public class ProgramVertex extends Program {
return mInputs[slot];
}
/** @deprecated renderscript is deprecated in J
/**
* Builder class for creating ProgramVertex objects.
* The builder starts empty and the user must minimally provide
* the GLSL shader code, and the varying inputs. Constant, or
@@ -81,7 +81,7 @@ public class ProgramVertex extends Program {
*
**/
public static class Builder extends BaseProgramBuilder {
/** @deprecated renderscript is deprecated in J
/**
* Create a builder object.
*
* @param rs Context to which the program will belong.
@@ -90,7 +90,7 @@ public class ProgramVertex extends Program {
super(rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Add varying inputs to the program
*
* @param e element describing the layout of the varying input
@@ -109,7 +109,7 @@ public class ProgramVertex extends Program {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates ProgramVertex from the current state of the builder
*
* @return ProgramVertex

24
graphics/java/android/renderscript/ProgramVertexFixedFunction.java
View File

@@ -21,7 +21,7 @@ import android.graphics.Matrix;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* ProgramVertexFixedFunction is a helper class that provides a
* simple way to create a fixed function emulation vertex shader
* without writing any GLSL code.
@@ -33,7 +33,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
super(id, rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Binds the constant buffer containing fixed function emulation
* matrices
*
@@ -61,7 +61,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
return this;
}
/** @deprecated renderscript is deprecated in J
/**
* Creates ProgramVertexFixedFunction from the current state of
* the builder
*
@@ -103,7 +103,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
String mShader;
RenderScript mRS;
/** @deprecated renderscript is deprecated in J
/**
* Creates a builder for fixed function vertex program
*
* @param rs Context to which the program will belong.
@@ -112,7 +112,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
mRS = rs;
}
/** @deprecated renderscript is deprecated in J
/**
* Specifies whether texture matrix calculations are to be added
* to the shader
*
@@ -152,7 +152,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
mShader += "}\n";
}
/** @deprecated renderscript is deprecated in J
/**
* Creates ProgramVertexFixedFunction from the current state of
* the builder
*
@@ -176,7 +176,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Helper class to store modelview, projection and texture
* matrices for ProgramVertexFixedFunction
*
@@ -196,7 +196,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
}
private FieldPacker mIOBuffer;
/** @deprecated renderscript is deprecated in J
/**
* Creates a buffer to store fixed function emulation matrices
*
* @param rs Context to which the allocation will belong.
@@ -215,7 +215,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
setTexture(new Matrix4f());
}
/** @deprecated renderscript is deprecated in J
/**
* Forces deallocation of memory backing the contant matrices.
* Normally, this is unnecessary and will be garbage collected
*
@@ -233,7 +233,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
mAlloc.setFromFieldPacker(0, mIOBuffer);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the modelview matrix in the fixed function matrix buffer
*
* @param m modelview matrix
@@ -243,7 +243,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
addToBuffer(MODELVIEW_OFFSET*4, m);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the projection matrix in the fixed function matrix buffer
*
* @param m projection matrix
@@ -253,7 +253,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
addToBuffer(PROJECTION_OFFSET*4, m);
}
/** @deprecated renderscript is deprecated in J
/**
* Sets the texture matrix in the fixed function matrix buffer.
* Texture matrix must be enabled in the
* ProgramVertexFixedFunction builder for the shader to utilize

2
graphics/java/android/renderscript/RSDriverException.java
View File

@@ -17,7 +17,7 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
* Base class for all exceptions thrown by the Android
* Renderscript
*/

4
graphics/java/android/renderscript/RSIllegalArgumentException.java
View File

@@ -17,13 +17,11 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
* Base class for all exceptions thrown by the Android
* Renderscript
*/
public class RSIllegalArgumentException extends RSRuntimeException {
/** @deprecated renderscript is deprecated in J
*/
public RSIllegalArgumentException(String string) {
super(string);
}

4
graphics/java/android/renderscript/RSInvalidStateException.java
View File

@@ -17,13 +17,11 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
* Base class for all exceptions thrown by the Android
* Renderscript
*/
public class RSInvalidStateException extends RSRuntimeException {
/** @deprecated renderscript is deprecated in J
*/
public RSInvalidStateException(String string) {
super(string);
}

4
graphics/java/android/renderscript/RSRuntimeException.java
View File

@@ -17,14 +17,12 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
* Base class for all exceptions thrown by the Android
* Renderscript
*/
public class RSRuntimeException
extends java.lang.RuntimeException {
/** @deprecated renderscript is deprecated in J
*/
public RSRuntimeException(String string) {
super(string);
}

16
graphics/java/android/renderscript/RSSurfaceView.java
View File

@@ -29,7 +29,7 @@ import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
/** @deprecated renderscript is deprecated in J
/**
* The Surface View for a graphics renderscript (RenderScriptGL) to draw on.
*
* <div class="special reference">
@@ -42,7 +42,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
private SurfaceHolder mSurfaceHolder;
private RenderScriptGL mRS;
/** @deprecated renderscript is deprecated in J
/**
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -53,7 +53,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
//Log.v(RenderScript.LOG_TAG, "RSSurfaceView");
}
/** @deprecated renderscript is deprecated in J
/**
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -71,7 +71,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
holder.addCallback(this);
}
/** @deprecated renderscript is deprecated in J
/**
* This method is part of the SurfaceHolder.Callback interface, and is
* not normally called or subclassed by clients of RSSurfaceView.
*/
@@ -79,7 +79,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
mSurfaceHolder = holder;
}
/** @deprecated renderscript is deprecated in J
/**
* This method is part of the SurfaceHolder.Callback interface, and is
* not normally called or subclassed by clients of RSSurfaceView.
*/
@@ -92,7 +92,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
}
}
/** @deprecated renderscript is deprecated in J
/**
* This method is part of the SurfaceHolder.Callback interface, and is
* not normally called or subclassed by clients of RSSurfaceView.
*/
@@ -104,7 +104,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
}
}
/** @deprecated renderscript is deprecated in J
/**
* Inform the view that the activity is paused. The owner of this view must
* call this method when the activity is paused. Calling this method will
* pause the rendering thread.
@@ -116,7 +116,7 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
}
}
/** @deprecated renderscript is deprecated in J
/**
* Inform the view that the activity is resumed. The owner of this view must
* call this method when the activity is resumed. Calling this method will
* recreate the OpenGL display and resume the rendering

18
graphics/java/android/renderscript/RSTextureView.java
View File

@@ -28,7 +28,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.TextureView;
/** @deprecated renderscript is deprecated in J
/**
* The Texture View for a graphics renderscript (RenderScriptGL)
* to draw on.
*
@@ -37,7 +37,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
private RenderScriptGL mRS;
private SurfaceTexture mSurfaceTexture;
/** @deprecated renderscript is deprecated in J
/**
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -48,7 +48,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
//Log.v(RenderScript.LOG_TAG, "RSSurfaceView");
}
/** @deprecated renderscript is deprecated in J
/**
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -102,7 +102,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
mSurfaceTexture = surface;
}
/** @deprecated renderscript is deprecated in J
/**
* Inform the view that the activity is paused. The owner of this view must
* call this method when the activity is paused. Calling this method will
* pause the rendering thread.
@@ -114,7 +114,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
}
}
/** @deprecated renderscript is deprecated in J
/**
* Inform the view that the activity is resumed. The owner of this view must
* call this method when the activity is resumed. Calling this method will
* recreate the OpenGL display and resume the rendering
@@ -127,7 +127,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
}
}
/** @deprecated renderscript is deprecated in J
/**
* Create a new RenderScriptGL object and attach it to the
* TextureView if present.
*
@@ -145,7 +145,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
return rs;
}
/** @deprecated renderscript is deprecated in J
/**
* Destroy the RenderScriptGL object associated with this
* TextureView.
*/
@@ -154,7 +154,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
mRS = null;
}
/** @deprecated renderscript is deprecated in J
/**
* Set a new RenderScriptGL object. This also will attach the
* new object to the TextureView if present.
*
@@ -167,7 +167,7 @@ public class RSTextureView extends TextureView implements TextureView.SurfaceTex
}
}
/** @deprecated renderscript is deprecated in J
/**
* Returns the previously set RenderScriptGL object.
*
* @return RenderScriptGL

26
graphics/java/android/renderscript/RenderScript.java
View File

@@ -32,7 +32,7 @@ import android.view.Surface;
/** @deprecated renderscript is deprecated in J
/**
* 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.
@@ -743,7 +743,7 @@ public class RenderScript {
///////////////////////////////////////////////////////////////////////////////////
//
/** @deprecated renderscript is deprecated in J
/**
* Base class application should derive from for handling RS messages
* coming from their scripts. When a script calls sendToClient the data
* fields will be filled in and then the run method called by a message
@@ -758,7 +758,7 @@ public class RenderScript {
public void run() {
}
}
/** @deprecated renderscript is deprecated in J
/**
* If an application is expecting messages it should set this field to an
* instance of RSMessage. This instance will receive all the user messages
* sent from sendToClient by scripts from this context.
@@ -773,7 +773,7 @@ public class RenderScript {
return mMessageCallback;
}
/** @deprecated renderscript is deprecated in J
/**
* Runtime error base class. An application should derive from this class
* if it wishes to install an error handler. When errors occur at runtime
* the fields in this class will be filled and the run method called.
@@ -786,7 +786,7 @@ public class RenderScript {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Application Error handler. All runtime errors will be dispatched to the
* instance of RSAsyncError set here. If this field is null a
* RSRuntimeException will instead be thrown with details about the error.
@@ -802,7 +802,7 @@ public class RenderScript {
return mErrorCallback;
}
/** @deprecated renderscript is deprecated in J
/**
* RenderScript worker threads priority enumeration. The default value is
* NORMAL. Applications wishing to do background processing such as
* wallpapers should set their priority to LOW to avoid starving forground
@@ -825,7 +825,7 @@ public class RenderScript {
}
/** @deprecated renderscript is deprecated in J
/**
* Change the priority of the worker threads for this context.
*
* @param p New priority to be set.
@@ -922,7 +922,7 @@ public class RenderScript {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Gets the application context associated with the RenderScript context.
*
* @return The application context.
@@ -931,7 +931,7 @@ public class RenderScript {
return mApplicationContext;
}
/** @deprecated renderscript is deprecated in J
/**
* Create a basic RenderScript context.
*
* @hide
@@ -951,7 +951,7 @@ public class RenderScript {
return rs;
}
/** @deprecated renderscript is deprecated in J
/**
* Create a basic RenderScript context.
*
* @param ctx The context.
@@ -962,7 +962,7 @@ public class RenderScript {
return create(ctx, v);
}
/** @deprecated renderscript is deprecated in J
/**
* Print the currently available debugging information about the state of
* the RS context to the log.
*
@@ -972,7 +972,7 @@ public class RenderScript {
nContextDump(0);
}
/** @deprecated renderscript is deprecated in J
/**
* Wait for any commands in the fifo between the java bindings and native to
* be processed.
*
@@ -981,7 +981,7 @@ public class RenderScript {
nContextFinish();
}
/** @deprecated renderscript is deprecated in J
/**
* Destroy this renderscript context. Once this function is called its no
* longer legal to use this or any objects created by this context.
*

36
graphics/java/android/renderscript/RenderScriptGL.java
View File

@@ -28,7 +28,7 @@ import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
/** @deprecated renderscript is deprecated in J
/**
* 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
@@ -45,7 +45,7 @@ public class RenderScriptGL extends RenderScript {
int mWidth;
int mHeight;
/** @deprecated renderscript is deprecated in J
/**
* Class which is used to describe a pixel format for a graphical buffer.
* This is used to describe the intended format of the display surface.
*
@@ -92,7 +92,7 @@ public class RenderScriptGL extends RenderScript {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Set the per-component bit depth for color (red, green, blue). This
* configures the surface for an unsigned integer buffer type.
*
@@ -105,7 +105,7 @@ public class RenderScriptGL extends RenderScript {
mColorPref = preferred;
}
/** @deprecated renderscript is deprecated in J
/**
* Set the bit depth for alpha. This configures the surface for
* an unsigned integer buffer type.
*
@@ -118,7 +118,7 @@ public class RenderScriptGL extends RenderScript {
mAlphaPref = preferred;
}
/** @deprecated renderscript is deprecated in J
/**
* Set the bit depth for the depth buffer. This configures the
* surface for an unsigned integer buffer type. If a minimum of 0
* is specified then its possible no depth buffer will be
@@ -133,7 +133,7 @@ public class RenderScriptGL extends RenderScript {
mDepthPref = preferred;
}
/** @deprecated renderscript is deprecated in J
/**
* Configure the multisample rendering.
*
* @param minimum The required number of samples, must be at least 1.
@@ -156,7 +156,7 @@ public class RenderScriptGL extends RenderScript {
SurfaceConfig mSurfaceConfig;
/** @deprecated renderscript is deprecated in J
/**
* Construct a new RenderScriptGL context.
*
* @param ctx The context.
@@ -186,7 +186,7 @@ public class RenderScriptGL extends RenderScript {
mMessageThread.start();
}
/** @deprecated renderscript is deprecated in J
/**
* Bind an os surface
*
*
@@ -205,7 +205,7 @@ public class RenderScriptGL extends RenderScript {
nContextSetSurface(w, h, s);
}
/** @deprecated renderscript is deprecated in J
/**
* Bind an os surface
*
* @param w
@@ -221,7 +221,7 @@ public class RenderScriptGL extends RenderScript {
nContextSetSurfaceTexture(w, h, sur);
}
/** @deprecated renderscript is deprecated in J
/**
* return the height of the last set surface.
*
* @return int
@@ -230,7 +230,7 @@ public class RenderScriptGL extends RenderScript {
return mHeight;
}
/** @deprecated renderscript is deprecated in J
/**
* return the width of the last set surface.
*
* @return int
@@ -239,7 +239,7 @@ public class RenderScriptGL extends RenderScript {
return mWidth;
}
/** @deprecated renderscript is deprecated in J
/**
* Temporarly halt calls to the root rendering script.
*
*/
@@ -248,7 +248,7 @@ public class RenderScriptGL extends RenderScript {
nContextPause();
}
/** @deprecated renderscript is deprecated in J
/**
* Resume calls to the root rendering script.
*
*/
@@ -258,7 +258,7 @@ public class RenderScriptGL extends RenderScript {
}
/** @deprecated renderscript is deprecated in J
/**
* Set the script to handle calls to render the primary surface.
*
* @param s Graphics script to process rendering requests.
@@ -268,7 +268,7 @@ public class RenderScriptGL extends RenderScript {
nContextBindRootScript(safeID(s));
}
/** @deprecated renderscript is deprecated in J
/**
* Set the default ProgramStore object seen as the parent state by the root
* rendering script.
*
@@ -279,7 +279,7 @@ public class RenderScriptGL extends RenderScript {
nContextBindProgramStore(safeID(p));
}
/** @deprecated renderscript is deprecated in J
/**
* Set the default ProgramFragment object seen as the parent state by the
* root rendering script.
*
@@ -290,7 +290,7 @@ public class RenderScriptGL extends RenderScript {
nContextBindProgramFragment(safeID(p));
}
/** @deprecated renderscript is deprecated in J
/**
* Set the default ProgramRaster object seen as the parent state by the
* root rendering script.
*
@@ -301,7 +301,7 @@ public class RenderScriptGL extends RenderScript {
nContextBindProgramRaster(safeID(p));
}
/** @deprecated renderscript is deprecated in J
/**
* Set the default ProgramVertex object seen as the parent state by the
* root rendering script.
*

40
graphics/java/android/renderscript/Sampler.java
View File

@@ -27,32 +27,18 @@ import android.util.Log;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
/** @deprecated renderscript is deprecated in J
/**
* Sampler object which defines how data is extracted from textures. Samplers
* are attached to Program objects (currently only ProgramFragment) when those objects
* need to access texture data.
**/
public class Sampler extends BaseObj {
/** @deprecated renderscript is deprecated in J
*/
public enum Value {
/** @deprecated renderscript is deprecated in J
*/
NEAREST (0),
/** @deprecated renderscript is deprecated in J
*/
LINEAR (1),
/** @deprecated renderscript is deprecated in J
*/
LINEAR_MIP_LINEAR (2),
/** @deprecated renderscript is deprecated in J
*/
LINEAR_MIP_NEAREST (5),
/** @deprecated renderscript is deprecated in J
*/
WRAP (3),
/** @deprecated renderscript is deprecated in J
*/
CLAMP (4);
int mID;
@@ -72,42 +58,42 @@ public class Sampler extends BaseObj {
super(id, rs);
}
/** @hide renderscript is deprecated in J
/**
* @return minification setting for the sampler
*/
public Value getMinification() {
return mMin;
}
/** @hide renderscript is deprecated in J
/**
* @return magnification setting for the sampler
*/
public Value getMagnification() {
return mMag;
}
/** @hide renderscript is deprecated in J
/**
* @return S wrapping mode for the sampler
*/
public Value getWrapS() {
return mWrapS;
}
/** @hide renderscript is deprecated in J
/**
* @return T wrapping mode for the sampler
*/
public Value getWrapT() {
return mWrapT;
}
/** @hide renderscript is deprecated in J
/**
* @return anisotropy setting for the sampler
*/
public float getAnisotropy() {
return mAniso;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with min and mag set to nearest and wrap modes set to
* clamp.
*
@@ -127,7 +113,7 @@ public class Sampler extends BaseObj {
return rs.mSampler_CLAMP_NEAREST;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with min and mag set to linear and wrap modes set to
* clamp.
*
@@ -147,7 +133,7 @@ public class Sampler extends BaseObj {
return rs.mSampler_CLAMP_LINEAR;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with ag set to linear, min linear mipmap linear, and
* to and wrap modes set to clamp.
*
@@ -167,7 +153,7 @@ public class Sampler extends BaseObj {
return rs.mSampler_CLAMP_LINEAR_MIP_LINEAR;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with min and mag set to nearest and wrap modes set to
* wrap.
*
@@ -187,7 +173,7 @@ public class Sampler extends BaseObj {
return rs.mSampler_WRAP_NEAREST;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with min and mag set to nearest and wrap modes set to
* wrap.
*
@@ -207,7 +193,7 @@ public class Sampler extends BaseObj {
return rs.mSampler_WRAP_LINEAR;
}
/** @deprecated renderscript is deprecated in J
/**
* Retrieve a sampler with ag set to linear, min linear mipmap linear, and
* to and wrap modes set to wrap.
*
@@ -228,7 +214,7 @@ public class Sampler extends BaseObj {
}
/** @deprecated renderscript is deprecated in J
/**
* Builder for creating non-standard samplers. Usefull if mix and match of
* wrap modes is necesary or if anisotropic filtering is desired.
*

28
graphics/java/android/renderscript/Script.java
View File

@@ -16,11 +16,11 @@
package android.renderscript;
/** @deprecated renderscript is deprecated in J
/**
*
**/
public class Script extends BaseObj {
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -29,7 +29,7 @@ public class Script extends BaseObj {
mRS.nScriptInvoke(getID(mRS), slot);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -43,7 +43,7 @@ public class Script extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -77,7 +77,7 @@ public class Script extends BaseObj {
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param va
@@ -92,7 +92,7 @@ public class Script extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -102,7 +102,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarF(getID(mRS), index, v);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -112,7 +112,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarD(getID(mRS), index, v);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -122,7 +122,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarI(getID(mRS), index, v);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -132,7 +132,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarJ(getID(mRS), index, v);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -142,7 +142,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarI(getID(mRS), index, v ? 1 : 0);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -152,7 +152,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarObj(getID(mRS), index, (o == null) ? 0 : o.getID(mRS));
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -162,7 +162,7 @@ public class Script extends BaseObj {
mRS.nScriptSetVarV(getID(mRS), index, v.getData());
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -174,8 +174,6 @@ public class Script extends BaseObj {
mRS.nScriptSetVarVE(getID(mRS), index, v.getData(), e.getID(mRS), dims);
}
/** @deprecated renderscript is deprecated in J
*/
public void setTimeZone(String timeZone) {
mRS.validate();
try {

6
graphics/java/android/renderscript/ScriptC.java
View File

@@ -29,13 +29,13 @@ import java.util.HashMap;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
/** @deprecated renderscript is deprecated in J
/**
*
**/
public class ScriptC extends Script {
private static final String TAG = "ScriptC";
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by the generated derived classes.
*
* @param id
@@ -45,7 +45,7 @@ public class ScriptC extends Script {
super(id, rs);
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by the generated derived classes.
*
*

2
graphics/java/android/renderscript/Short2.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript Short2 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Short3.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript short3 type back to the Android system.
*
**/

2
graphics/java/android/renderscript/Short4.java
View File

@@ -20,7 +20,7 @@ import java.lang.Math;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* Class for exposing the native Renderscript short4 type back to the Android system.
*
**/

24
graphics/java/android/renderscript/Type.java
View File

@@ -20,7 +20,7 @@ package android.renderscript;
import java.lang.reflect.Field;
import android.util.Log;
/** @deprecated renderscript is deprecated in J
/**
* <p>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 any
* storage for the data that is described.</p>
@@ -70,7 +70,7 @@ public class Type extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Return the element associated with this Type.
*
* @return Element
@@ -79,7 +79,7 @@ public class Type extends BaseObj {
return mElement;
}
/** @deprecated renderscript is deprecated in J
/**
* Return the value of the X dimension.
*
* @return int
@@ -88,7 +88,7 @@ public class Type extends BaseObj {
return mDimX;
}
/** @deprecated renderscript is deprecated in J
/**
* Return the value of the Y dimension or 0 for a 1D allocation.
*
* @return int
@@ -97,7 +97,7 @@ public class Type extends BaseObj {
return mDimY;
}
/** @deprecated renderscript is deprecated in J
/**
* Return the value of the Z dimension or 0 for a 1D or 2D allocation.
*
* @return int
@@ -106,7 +106,7 @@ public class Type extends BaseObj {
return mDimZ;
}
/** @deprecated renderscript is deprecated in J
/**
* Return if the Type has a mipmap chain.
*
* @return boolean
@@ -115,7 +115,7 @@ public class Type extends BaseObj {
return mDimMipmaps;
}
/** @deprecated renderscript is deprecated in J
/**
* Return if the Type is a cube map.
*
* @return boolean
@@ -124,7 +124,7 @@ public class Type extends BaseObj {
return mDimFaces;
}
/** @deprecated renderscript is deprecated in J
/**
* Return the total number of accessable cells in the Type.
*
* @return int
@@ -196,7 +196,7 @@ public class Type extends BaseObj {
calcElementCount();
}
/** @deprecated renderscript is deprecated in J
/**
* Builder class for Type.
*
*/
@@ -210,7 +210,7 @@ public class Type extends BaseObj {
Element mElement;
/** @deprecated renderscript is deprecated in J
/**
* Create a new builder object.
*
* @param rs
@@ -222,7 +222,7 @@ public class Type extends BaseObj {
mElement = e;
}
/** @deprecated renderscript is deprecated in J
/**
* Add a dimension to the Type.
*
*
@@ -255,7 +255,7 @@ public class Type extends BaseObj {
}
/** @deprecated renderscript is deprecated in J
/**
* Validate structure and create a new type.
*
* @return Type