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/AllocationAdapter.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/AllocationAdapter.java')
-rw-r--r-- | graphics/java/android/renderscript/AllocationAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/graphics/java/android/renderscript/AllocationAdapter.java index a6645bb591dc..b77d087a01aa 100644 --- a/graphics/java/android/renderscript/AllocationAdapter.java +++ b/graphics/java/android/renderscript/AllocationAdapter.java @@ -26,12 +26,12 @@ import android.util.TypedValue; * **/ public class AllocationAdapter extends Allocation { - AllocationAdapter(int id, RenderScript rs, Allocation alloc) { + AllocationAdapter(long id, RenderScript rs, Allocation alloc) { super(id, rs, alloc.mType, alloc.mUsage); mAdaptedAllocation = alloc; } - int getID(RenderScript rs) { + long getID(RenderScript rs) { throw new RSInvalidStateException( "This operation is not supported with adapters at this time."); } |