From d61b48c090cf288e406db11f3106257643657ead Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Wed, 26 Feb 2014 09:56:09 +0000 Subject: [PATCH] AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY 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: I0d7e9ca5410b0dd893eacc02aac40956908e4f25 Signed-off-by: Ashok Bhat --- opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp | 2 +- opengl/tools/glgen/stubs/egl/eglGetDisplay.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp b/opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp index 4c353a2a9..003efd3e1 100755 --- a/opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp +++ b/opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp @@ -14,7 +14,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/tools/glgen/stubs/egl/eglGetDisplay.java b/opengl/tools/glgen/stubs/egl/eglGetDisplay.java index 532eb0982..7532abf3a 100755 --- a/opengl/tools/glgen/stubs/egl/eglGetDisplay.java +++ b/opengl/tools/glgen/stubs/egl/eglGetDisplay.java @@ -1,10 +1,9 @@ // 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} */