diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-27 13:29:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-27 13:29:42 +0000 |
| commit | 2c95c57b62ca8ca28065642f34ca90bf06eec29f (patch) | |
| tree | e172e2ac997c2943aa3e4730ed0b5f55e478d039 | |
| parent | c5e2442e59c427a921139722a7431e412f359dd8 (diff) | |
| parent | 3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1 (diff) | |
| download | frameworks_native-2c95c57b62ca8ca28065642f34ca90bf06eec29f.zip frameworks_native-2c95c57b62ca8ca28065642f34ca90bf06eec29f.tar.gz frameworks_native-2c95c57b62ca8ca28065642f34ca90bf06eec29f.tar.bz2 | |
am 3e599252: am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
| -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} */ |