diff options
| author | Miao Wang <miaowang@google.com> | 2014-11-14 18:02:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-14 18:02:13 +0000 |
| commit | 34c495d2e9d873aeb7e3d86077f0ef4b8d8993b6 (patch) | |
| tree | ac0beef3e2c656a77a3a45c4cc2a6d762277e7c5 /rs/java/android/renderscript | |
| parent | 5b50cd13688e0a71991b5335d3a28189e1906a2c (diff) | |
| parent | 8f3cc4582dba6beaf9630239d4ad861543964f93 (diff) | |
Merge "Add Float32 suppor for IntrinsicResize. base part."
Diffstat (limited to 'rs/java/android/renderscript')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicResize.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicResize.java b/rs/java/android/renderscript/ScriptIntrinsicResize.java index d6764ccab75e..cee4c33ee87d 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicResize.java +++ b/rs/java/android/renderscript/ScriptIntrinsicResize.java @@ -29,6 +29,8 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic { /** * Supported elements types are {@link Element#U8}, {@link * Element#U8_2}, {@link Element#U8_3}, {@link Element#U8_4} + * {@link Element#F32}, {@link Element#F32_2}, {@link + * Element#F32_3}, {@link Element#F32_4} * * @param rs The RenderScript context * @@ -52,7 +54,11 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic { if (!e.isCompatible(Element.U8(mRS)) && !e.isCompatible(Element.U8_2(mRS)) && !e.isCompatible(Element.U8_3(mRS)) && - !e.isCompatible(Element.U8_4(mRS))) { + !e.isCompatible(Element.U8_4(mRS)) && + !e.isCompatible(Element.F32(mRS)) && + !e.isCompatible(Element.F32_2(mRS)) && + !e.isCompatible(Element.F32_3(mRS)) && + !e.isCompatible(Element.F32_4(mRS))) { throw new RSIllegalArgumentException("Unsuported element type."); } |