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

Commit 3fb6feac authored by Tim Murray's avatar Tim Murray Committed by Gerrit Code Review
Browse files

Merge "Check that bound allocations are 1D"

parents 0cc37f4c cf9c894a

rs/java/android/renderscript/Script.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,13 @@ public class Script extends BaseObj { 
    public void bindAllocation(Allocation va, int slot) {

    public void bindAllocation(Allocation va, int slot) {

        mRS.validate();

        mRS.validate();

        if (va != null) {

        if (va != null) {

            if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 20) {

                final Type t = va.mType;

                if (t.hasMipmaps() || t.hasFaces() || (t.getY() != 0) || (t.getZ() != 0)) {

                    throw new RSIllegalArgumentException(

                        "API 20+ only allows simple 1D allocations to be used with bind.");

                }

            }

            mRS.nScriptBindAllocation(getID(mRS), va.getID(mRS), slot);

            mRS.nScriptBindAllocation(getID(mRS), va.getID(mRS), slot);

        } else {

        } else {

            mRS.nScriptBindAllocation(getID(mRS), 0, slot);

            mRS.nScriptBindAllocation(getID(mRS), 0, slot);