diff options
| author | 2011-06-06 10:54:26 -0700 | |
|---|---|---|
| committer | 2011-06-06 10:54:26 -0700 | |
| commit | aece2ccccbf65cfeba642d11fa4bd0c794498f23 (patch) | |
| tree | 6038a65a558700aaa946f9a7f756114812d95f1c | |
| parent | f7445916c5c206757f89b515af502654b3423376 (diff) | |
| parent | 85dae045a2c3ac7b9d4bcad7a83ec587d0b7813e (diff) | |
Merge "Unhiding render target code for renderscript"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 8ef07debd226..7dd881678f2e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16438,6 +16438,7 @@ package android.renderscript { method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker); method public void syncAll(int); field public static final int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8 + field public static final int USAGE_GRAPHICS_RENDER_TARGET = 16; // 0x10 field public static final int USAGE_GRAPHICS_TEXTURE = 2; // 0x2 field public static final int USAGE_GRAPHICS_VERTEX = 4; // 0x4 field public static final int USAGE_SCRIPT = 1; // 0x1 diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 9ac1a00b9a8a..3c8aba36563a 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -100,7 +100,6 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_CONSTANTS = 0x0008; /** - * @hide * USAGE_GRAPHICS_RENDER_TARGET The allcation will be used as a * target for offscreen rendering * |