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

Commit 31e12acc authored by Tim Murray's avatar Tim Murray Committed by Stephen Hines
Browse files

Update copyFrom(BaseObj[]) for large objects. 

Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
parent d74f99d3

rs/java/android/renderscript/Allocation.java

+12 −5
Original line number Diff line number Diff line
@@ -518,13 +518,20 @@ public class Allocation extends BaseObj { 
            throw new RSIllegalArgumentException("Array size mismatch, allocation sizeX = " +

                                                 mCurrentCount + ", array length = " + d.length);

        }

        // FIXME: requires 64-bit path



        if (RenderScript.sPointerSize == 8) {

            long i[] = new long[d.length * 4];

            for (int ct=0; ct < d.length; ct++) {

                i[ct * 4] = d[ct].getID(mRS);

            }

            copy1DRangeFromUnchecked(0, mCurrentCount, i);

        } else {

            int i[] = new int[d.length];

            for (int ct=0; ct < d.length; ct++) {

                i[ct] = (int)d[ct].getID(mRS);

            }

            copy1DRangeFromUnchecked(0, mCurrentCount, i);

        }

        Trace.traceEnd(RenderScript.TRACE_TAG);

    }