diff options
| author | Stephen Hines <srhines@google.com> | 2012-05-08 14:25:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 14:25:49 -0700 |
| commit | 1d56afc6ace90e7cbd32d776b73173ef0dfa95c4 (patch) | |
| tree | dfc8d082fd1d4b19c9bd4a888dfa8f72116bcdb3 /graphics/java/android/renderscript/ProgramFragment.java | |
| parent | aa9972943cab627db9b10e5c9c4bb80f99f8a4bd (diff) | |
| parent | 9c9ad3f8c218954e46aab81f9af7834cea5675ca (diff) | |
Merge "Revert "Deprecate"" into jb-dev
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 |