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

Commit 6faa4d20 authored by Jason Sams's avatar Jason Sams
Browse files

Fix issues found during CTS testing of FP16 

bug 20822382

This corrects a copy&paste error placing F16 into F32.
Fixes an error disallowing vectors of fp16 types.

Change-Id: I34be1aa9a323d61a7121581ab9599d2c2d32dd42
parent f7642306

rs/java/android/renderscript/Element.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -536,8 +536,8 @@ public class Element extends BaseObj { 
    }

    }





    public static Element F16_3(RenderScript rs) {

    public static Element F16_3(RenderScript rs) {

        if(rs.mElement_FLOAT_3 == null) {

        if(rs.mElement_HALF_3 == null) {

            rs.mElement_FLOAT_3 = createVector(rs, DataType.FLOAT_16, 3);

            rs.mElement_HALF_3 = createVector(rs, DataType.FLOAT_16, 3);

        }

        }

        return rs.mElement_HALF_3;

        return rs.mElement_HALF_3;

    }

    }
@@ -911,6 +911,7 @@ public class Element extends BaseObj { 




        switch (dt) {

        switch (dt) {

        // Support only primitive integer/float/boolean types as vectors.

        // Support only primitive integer/float/boolean types as vectors.

        case FLOAT_16:

        case FLOAT_32:

        case FLOAT_32:

        case FLOAT_64:

        case FLOAT_64:

        case SIGNED_8:

        case SIGNED_8: