summaryrefslogtreecommitdiffstats
path: root/opengl/tools
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-27 14:12:55 +0000
committerNarayan Kamath <narayan@google.com>2014-02-27 14:12:55 +0000
commita90086a914f2fad9686e8e3d23dcdf65f38360eb (patch)
treee4aab2274b61b77afe2ddbfa4075c16eb98b7c29 /opengl/tools
parent2c95c57b62ca8ca28065642f34ca90bf06eec29f (diff)
downloadframeworks_native-a90086a914f2fad9686e8e3d23dcdf65f38360eb.zip
frameworks_native-a90086a914f2fad9686e8e3d23dcdf65f38360eb.tar.gz
frameworks_native-a90086a914f2fad9686e8e3d23dcdf65f38360eb.tar.bz2
API changes for 64 bit platforms.
EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle() have now been deprecated and replaced with variants that take and return java longs. bug: 13181704 Change-Id: Ie88e591c288d6de5655364b4cd673f61cce68d7d
Diffstat (limited to 'opengl/tools')
-rw-r--r--opengl/tools/glgen/static/egl/EGLObjectHandle.java29
1 files changed, 14 insertions, 15 deletions
diff --git a/opengl/tools/glgen/static/egl/EGLObjectHandle.java b/opengl/tools/glgen/static/egl/EGLObjectHandle.java
index e6e3976..113f867 100644
--- a/opengl/tools/glgen/static/egl/EGLObjectHandle.java
+++ b/opengl/tools/glgen/static/egl/EGLObjectHandle.java
@@ -24,36 +24,35 @@ package android.opengl;
public abstract class EGLObjectHandle {
private final long mHandle;
- // TODO Deprecate EGLObjectHandle(int) method
+ /**
+ * @deprecated Use {@link EGLObjectHandle(long)} instead. Handles
+ * on 64 bit platforms will be wider than java ints.
+ */
+ @Deprecated
protected EGLObjectHandle(int handle) {
mHandle = handle;
}
- // TODO Unhide the EGLObjectHandle(long) method
- /**
- * {@hide}
- */
protected EGLObjectHandle(long handle) {
mHandle = handle;
}
- // TODO Deprecate getHandle() method in favor of getNativeHandle()
/**
- * Returns the native handle of the wrapped EGL object. This handle can be
- * cast to the corresponding native type on the native side.
- *
- * For example, EGLDisplay dpy = (EGLDisplay)handle;
- *
- * @return the native handle of the wrapped EGL object.
+ * @deprecated Use {@link #getNativeHandle()} instead. Handles on
+ * 64 bit platforms will be wider than java ints.
*/
+ @Deprecated
public int getHandle() {
if ((mHandle & 0xffffffffL) != mHandle) {
throw new UnsupportedOperationException();
}
return (int)mHandle;
}
-
- // TODO Unhide getNativeHandle() method
/**
- * {@hide}
+ * Returns the native handle of the wrapped EGL object. This handle can be
+ * cast to the corresponding native type on the native side.
+ *
+ * For example, EGLDisplay dpy = (EGLDisplay)handle;
+ *
+ * @return the native handle of the wrapped EGL object.
*/
public long getNativeHandle() {
return mHandle;