Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 373f559d authored by Miao Wang's avatar Miao Wang Committed by The Android Automerger
Browse files

[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram 

Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
parent e6d2e786

rs/java/android/renderscript/ScriptIntrinsicHistogram.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -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);