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/ProgramVertex.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/ProgramVertex.java')
| -rw-r--r-- | rs/java/android/renderscript/ProgramVertex.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/ProgramVertex.java b/rs/java/android/renderscript/ProgramVertex.java index b6886e1e7d39..d3a51ded2366 100644 --- a/rs/java/android/renderscript/ProgramVertex.java +++ b/rs/java/android/renderscript/ProgramVertex.java @@ -126,25 +126,25 @@ public class ProgramVertex extends Program { */ public ProgramVertex 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]; } |