From 0e0c0885aed99a119052a792becb5a0c5a93632d Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Tue, 4 Feb 2014 14:57:58 +0000 Subject: AArch64: Use long for pointers in RS Java/JNI code Changes include [x] Some JNI functions, with return type jlong, casts pointer to jint before returning it. This has been fixed. [x] Minor JNI function prototype changes where formal paramter type has been changed to a JNI type (int to jint for example). [x] long is used for ScriptC, Sampler, Font, ProgramStore handles as they can be 64-bit. [x] A new hidden constructor ScriptC(long, RenderScript) has been added. This should eventually replace public API method ScriptC(int, RenderScript). [x] Font and FileA3D use getNativeAsset instead of getAssetInt to get Asset Handles. The getAssetInt method will be deprecated in favor of getNativeAsset, as the former does not support 64-bit. [x] rsnPathCreate method accepts loop as an int. This should be long as the underlying RS function assumes this to be a pointer. Change-Id: I919d857e5933febe63966049da83de9f9adee6f5 Signed-off-by: Ashok Bhat --- rs/java/android/renderscript/Sampler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rs/java/android/renderscript/Sampler.java') diff --git a/rs/java/android/renderscript/Sampler.java b/rs/java/android/renderscript/Sampler.java index 623055fe7782..8d0e29e5eeff 100644 --- a/rs/java/android/renderscript/Sampler.java +++ b/rs/java/android/renderscript/Sampler.java @@ -60,7 +60,7 @@ public class Sampler extends BaseObj { Value mWrapR; float mAniso; - Sampler(int id, RenderScript rs) { + Sampler(long id, RenderScript rs) { super(id, rs); } @@ -347,7 +347,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; -- cgit v1.2.3