am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
  AArch64: Use long for pointers in RS Java/JNI code
This commit is contained in:
Narayan Kamath
2014-02-10 13:45:15 +00:00
committed by Android Git Automerger
8 changed files with 96 additions and 87 deletions

View File

@@ -49,7 +49,7 @@ public class Sampler extends BaseObj {
Value mWrapR;
float mAniso;
Sampler(int id, RenderScript rs) {
Sampler(long id, RenderScript rs) {
super(id, rs);
}
@@ -336,7 +336,7 @@ public class Sampler extends BaseObj {
public Sampler create() {
mRS.validate();
int id = mRS.nSamplerCreate(mMag.mID, mMin.mID,
long id = mRS.nSamplerCreate(mMag.mID, mMin.mID,
mWrapS.mID, mWrapT.mID, mWrapR.mID, mAniso);
Sampler sampler = new Sampler(id, mRS);
sampler.mMin = mMin;