diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-28 13:31:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-28 13:31:58 +0000 |
| commit | 62d675c240fd87cb987c86ae4f6ac17dc13374c8 (patch) | |
| tree | 2ecaecac464d3aa4e71b79b29f4ff3f52e860e48 /rs/java/android/renderscript/Element.java | |
| parent | 098bed6f27b05c16ecc30f9d39005e5995f14263 (diff) | |
| parent | 0d3548bea9986bb7446156699e200ffa147a3a02 (diff) | |
am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"
* commit '0d3548bea9986bb7446156699e200ffa147a3a02':
AArch64: Use long[] for RS id array
Diffstat (limited to 'rs/java/android/renderscript/Element.java')
| -rw-r--r-- | rs/java/android/renderscript/Element.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java index 293277016908..aa5d687960c5 100644 --- a/rs/java/android/renderscript/Element.java +++ b/rs/java/android/renderscript/Element.java @@ -803,8 +803,6 @@ public class Element extends BaseObj { void updateFromNative() { super.updateFromNative(); - // FIXME: updateFromNative is broken in JNI for 64-bit - // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements int[] dataBuffer = new int[5]; mRS.nElementGetNativeData(getID(mRS), dataBuffer); @@ -831,7 +829,7 @@ public class Element extends BaseObj { mArraySizes = new int[numSubElements]; mOffsetInBytes = new int[numSubElements]; - int[] subElementIds = new int[numSubElements]; + long[] subElementIds = new long[numSubElements]; mRS.nElementGetSubElements(getID(mRS), subElementIds, mElementNames, mArraySizes); for(int i = 0; i < numSubElements; i ++) { mElements[i] = new Element(subElementIds[i], mRS); @@ -1090,10 +1088,9 @@ public class Element extends BaseObj { java.lang.System.arraycopy(mElementNames, 0, sin, 0, mCount); java.lang.System.arraycopy(mArraySizes, 0, asin, 0, mCount); - // FIXME: broken for 64-bit - int[] ids = new int[ein.length]; + long[] ids = new long[ein.length]; for (int ct = 0; ct < ein.length; ct++ ) { - ids[ct] = (int)ein[ct].getID(mRS); + ids[ct] = ein[ct].getID(mRS); } long id = mRS.nElementCreate2(ids, sin, asin); return new Element(id, mRS, ein, sin, asin); |