Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev

Browse Source
This commit is contained in:
Miao Wang
2015-01-23 19:17:11 +00:00
committed by Android (Google) Code Review
parent af8c621d21 8a1265384b
commit 2772ee6d81
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rs/java/android/renderscript/ScriptIntrinsicHistogram.java
View File

@@ -92,8 +92,10 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic {
"Input vector size must be >= output vector size."); "Input vector size must be >= output vector size.");
} }
if (!ain.getType().getElement().isCompatible(Element.U8(mRS)) && 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))) { !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); 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."); throw new RSIllegalArgumentException("Output vector size must be one.");
} }
if (!ain.getType().getElement().isCompatible(Element.U8(mRS)) && 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))) { !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); forEach(1, ain, null, null, opt);