diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2014-02-26 09:56:09 +0000 |
|---|---|---|
| committer | Ashok Bhat <ashok.bhat@arm.com> | 2014-02-26 19:06:27 +0000 |
| commit | d61b48c090cf288e406db11f3106257643657ead (patch) | |
| tree | f3209e3a64b70c2badf55c70469bde174c734ab6 /opengl/tools | |
| parent | c9bf3ba411c66dd1d977c81f1aca08109cbf8c86 (diff) | |
| download | frameworks_native-d61b48c090cf288e406db11f3106257643657ead.zip frameworks_native-d61b48c090cf288e406db11f3106257643657ead.tar.gz frameworks_native-d61b48c090cf288e406db11f3106257643657ead.tar.bz2 | |
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 <ashok.bhat@arm.com>
Diffstat (limited to 'opengl/tools')
| -rwxr-xr-x | opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp | 2 | ||||
| -rwxr-xr-x | 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 4c353a2..003efd3 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 532eb09..7532abf 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} */ |