Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."

Browse Source 
* commit '4fea742c07d2d55f29b7d61078914c5f83817313':
  Update copyFrom(BaseObj[]) for large objects.
This commit is contained in:
Stephen Hines
2014-07-10 00:16:44 +00:00
committed by Android Git Automerger
parent 3964ea4675 4fea742c07
commit 8348c35165
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rs/java/android/renderscript/Allocation.java
View File

@@ -518,13 +518,20 @@ public class Allocation extends BaseObj {
throw new RSIllegalArgumentException("Array size mismatch, allocation sizeX = " + throw new RSIllegalArgumentException("Array size mismatch, allocation sizeX = " +
mCurrentCount + ", array length = " + d.length); 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]; int i[] = new int[d.length];
for (int ct=0; ct < d.length; ct++) { for (int ct=0; ct < d.length; ct++) {
i[ct] = (int)d[ct].getID(mRS); i[ct] = (int)d[ct].getID(mRS);
} }
copy1DRangeFromUnchecked(0, mCurrentCount, i); copy1DRangeFromUnchecked(0, mCurrentCount, i);
}
Trace.traceEnd(RenderScript.TRACE_TAG); Trace.traceEnd(RenderScript.TRACE_TAG);
} }