commit 3de3dc79e569bac3205e9af1ffe726964b845358
author Tim Murray <timmurray@google.com> Tue Jul 01 16:56:18 2014 -0700
committer Tim Murray <timmurray@google.com> Wed Jul 09 15:30:42 2014 -0700
tree adc639d477299df59b0aeb4379f6bba0d41503bd
parent dbbf07a5c7f514f2168f236e1df3b2ca70d4ab2f

Update copyFrom(BaseObj[]) for large objects.

Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9

rs/java/android/renderscript/Allocation.java

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index d9588e8..ac76ddf 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -514,13 +514,20 @@
             throw new RSIllegalArgumentException("Array size mismatch, allocation sizeX = " +
                                                  mCurrentCount + ", array length = " + d.length);
         }
-        // FIXME: requires 64-bit path
 
-        int i[] = new int[d.length];
-        for (int ct=0; ct < d.length; ct++) {
-            i[ct] = (int)d[ct].getID(mRS);
+        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);
         }
-        copy1DRangeFromUnchecked(0, mCurrentCount, i);
         Trace.traceEnd(RenderScript.TRACE_TAG);
     }