diff options
author | Narayan Kamath <narayan@google.com> | 2014-02-28 13:22:24 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-28 13:22:26 +0000 |
commit | 14420e29abc0f16f818ddaf606515861ba69ae68 (patch) | |
tree | d229f42ff85cd6db1b3a5547585c607666546d3d /rs/java/android/renderscript/ProgramFragment.java | |
parent | 0c72b76963f7f43a2f986c38831ce76b43c6275a (diff) | |
parent | 9807155b11a25fb6068edc9b1cd82928ac2f05de (diff) |
Merge "AArch64: Use long[] for RS id array"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
-rw-r--r-- | rs/java/android/renderscript/ProgramFragment.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/ProgramFragment.java b/rs/java/android/renderscript/ProgramFragment.java index 5e886a32d77a..4bb527b5f347 100644 --- a/rs/java/android/renderscript/ProgramFragment.java +++ b/rs/java/android/renderscript/ProgramFragment.java @@ -65,25 +65,25 @@ public class ProgramFragment extends Program { */ public ProgramFragment create() { mRS.validate(); - int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; + long[] tmp = new long[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; String[] texNames = new String[mTextureCount]; int idx = 0; for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = (int)mInputs[i].getID(mRS); + tmp[idx++] = mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = (int)mOutputs[i].getID(mRS); + tmp[idx++] = mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = (int)mConstants[i].getID(mRS); + tmp[idx++] = mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = (int)mTextureTypes[i].mID; + tmp[idx++] = mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } |