Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev (2772ee6d) · Commits · e / os / android_frameworks_base

rs/java/android/renderscript/ScriptIntrinsicHistogram.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -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);