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

Commit 137d0420 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Allow single channel and float convolve."

parents 9c5c31d2 048c978a

graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { 
     */

    public static ScriptIntrinsicConvolve3x3 create(RenderScript rs, Element e) {

        float f[] = { 0, 0, 0, 0, 1, 0, 0, 0, 0};

        if (!e.isCompatible(Element.U8_4(rs))) {

        if (!e.isCompatible(Element.U8(rs)) &&

            !e.isCompatible(Element.U8_4(rs)) &&

            !e.isCompatible(Element.F32(rs)) &&

            !e.isCompatible(Element.F32_4(rs))) {

            throw new RSIllegalArgumentException("Unsuported element type.");

        }

        int id = rs.nScriptIntrinsicCreate(1, e.getID(rs));

graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { 
     * @return ScriptIntrinsicConvolve5x5

     */

    public static ScriptIntrinsicConvolve5x5 create(RenderScript rs, Element e) {

        if (!e.isCompatible(Element.U8(rs)) &&

            !e.isCompatible(Element.U8_4(rs)) &&

            !e.isCompatible(Element.F32(rs)) &&

            !e.isCompatible(Element.F32_4(rs))) {

            throw new RSIllegalArgumentException("Unsuported element type.");

        }



        int id = rs.nScriptIntrinsicCreate(4, e.getID(rs));

        return new ScriptIntrinsicConvolve5x5(id, rs);