diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-23 19:34:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 19:34:48 +0000 |
| commit | 2fd1a8b6ca93a99c083a3269ae69ae7d67701a8b (patch) | |
| tree | afe9e9aa3d2a2949a1aa4b422abd8adc8833f550 /rs | |
| parent | f647cde899c4462b465721cd705f234da7e82730 (diff) | |
| parent | 1446eb8f6130e4833ca2b74331b867d30445aca3 (diff) | |
| download | frameworks_base-2fd1a8b6ca93a99c083a3269ae69ae7d67701a8b.zip frameworks_base-2fd1a8b6ca93a99c083a3269ae69ae7d67701a8b.tar.gz frameworks_base-2fd1a8b6ca93a99c083a3269ae69ae7d67701a8b.tar.bz2 | |
am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev
automerge: 1446eb8
* commit '1446eb8f6130e4833ca2b74331b867d30445aca3':
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicHistogram.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicHistogram.java b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java index 4ecac99..f8c0c16 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicHistogram.java +++ b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java @@ -92,8 +92,10 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { "Input vector size must be >= output vector size."); } if (!ain.getType().getElement().isCompatible(Element.U8(mRS)) && + !ain.getType().getElement().isCompatible(Element.U8_2(mRS)) && + !ain.getType().getElement().isCompatible(Element.U8_3(mRS)) && !ain.getType().getElement().isCompatible(Element.U8_4(mRS))) { - throw new RSIllegalArgumentException("Input type must be U8 or U8_4."); + throw new RSIllegalArgumentException("Input type must be U8, U8_1, U8_2 or U8_4."); } forEach(0, ain, null, null, opt); @@ -188,8 +190,10 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { throw new RSIllegalArgumentException("Output vector size must be one."); } if (!ain.getType().getElement().isCompatible(Element.U8(mRS)) && + !ain.getType().getElement().isCompatible(Element.U8_2(mRS)) && + !ain.getType().getElement().isCompatible(Element.U8_3(mRS)) && !ain.getType().getElement().isCompatible(Element.U8_4(mRS))) { - throw new RSIllegalArgumentException("Input type must be U8 or U8_4."); + throw new RSIllegalArgumentException("Input type must be U8, U8_1, U8_2 or U8_4."); } forEach(1, ain, null, null, opt); |