diff options
| author | Tim Murray <timmurray@google.com> | 2013-11-19 12:45:54 -0800 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2013-11-20 10:18:04 -0800 |
| commit | 460a04971c494fec39ffcb38e873bb8fdd82d113 (patch) | |
| tree | b1567d93e44eec510a0c3adcd9bacd6f2542a860 /graphics/java/android/renderscript/BaseObj.java | |
| parent | eff663f391fa4f119685d5c14489b94661ea126f (diff) | |
Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats:
1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.
bug 11332320
Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
Diffstat (limited to 'graphics/java/android/renderscript/BaseObj.java')
| -rw-r--r-- | graphics/java/android/renderscript/BaseObj.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java index e17d79a24161..41159b987a2b 100644 --- a/graphics/java/android/renderscript/BaseObj.java +++ b/graphics/java/android/renderscript/BaseObj.java @@ -25,7 +25,7 @@ import android.util.Log; * **/ public class BaseObj { - BaseObj(int id, RenderScript rs) { + BaseObj(long id, RenderScript rs) { rs.validate(); mRS = rs; mID = id; @@ -46,9 +46,9 @@ public class BaseObj { * @param rs Context to verify against internal context for * match. * - * @return int + * @return long */ - int getID(RenderScript rs) { + long getID(RenderScript rs) { mRS.validate(); if (mDestroyed) { throw new RSInvalidStateException("using a destroyed object."); @@ -68,7 +68,7 @@ public class BaseObj { } } - private int mID; + private long mID; private boolean mDestroyed; private String mName; RenderScript mRS; @@ -152,7 +152,7 @@ public class BaseObj { */ @Override public int hashCode() { - return mID; + return (int)((mID & 0xfffffff) ^ (mID >> 32)); } /** |