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

Revert "Deprecate"

Browse Source 
This reverts commit a0c2eb27b4.

Conflicts:

	api/current.txt
	graphics/java/android/renderscript/Element.java
	graphics/java/android/renderscript/Script.java

Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963
This commit is contained in:
Stephen Hines
2012-05-07 15:34:29 -07:00
parent b3482ffbee
commit 9c9ad3f8c2
50 changed files with 960 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);