diff options
| author | 2014-02-26 10:00:48 +0000 | |
|---|---|---|
| committer | 2014-02-26 19:07:54 +0000 | |
| commit | 64d38d9f4863f6e9434e6820b924eb958e8a2230 (patch) | |
| tree | 243037836541cee05e0aebc83944503af726e217 | |
| parent | 2ba70fd49bfcbb516e75c198c106764609335feb (diff) | |
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script
This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.
Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| -rw-r--r-- | core/jni/android_opengl_EGL14.cpp | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/EGL14.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index bf65dfc2e50a..19e4d99cb21d 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -156,7 +156,7 @@ static jobject android_eglGetDisplayInt (JNIEnv *_env, jobject _this, jint display_id) { - if (sizeof(void*) != sizeof(uint32_t)) { + if ((EGLNativeDisplayType)display_id != EGL_DEFAULT_DISPLAY) { jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay"); return 0; } diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index b6dd9c25667e..cf09c5865b98 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -155,12 +155,11 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; ); // C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id ) - // TODO Deprecate the eglGetDisplay(int) API method public static native EGLDisplay eglGetDisplay( int display_id ); - // TODO Unhide the eglGetDisplay(long) API method + /** * {@hide} */ |