diff options
| author | Stephen Hines <srhines@google.com> | 2012-05-07 15:34:29 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-05-07 15:34:29 -0700 |
| commit | 9c9ad3f8c218954e46aab81f9af7834cea5675ca (patch) | |
| tree | 1ae4ba36dda77457b82b8e2705ecdcc2dc370327 /graphics/java/android/renderscript/ProgramFragment.java | |
| parent | b3482ffbeee30650359e6ab8f3950a83e06963b4 (diff) | |
Revert "Deprecate"
This reverts commit a0c2eb27b408660b02fa248943166d6c7e447908.
Conflicts:
api/current.txt
graphics/java/android/renderscript/Element.java
graphics/java/android/renderscript/Script.java
Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
| -rw-r--r-- | graphics/java/android/renderscript/ProgramFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java index 0427c19babfc..fa6e2d4c1847 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/graphics/java/android/renderscript/ProgramFragment.java @@ -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 |