diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-27 13:23:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-27 13:23:09 +0000 |
| commit | 3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1 (patch) | |
| tree | d750c832fafb6185a6a7e60ec88184e5ab942d64 /opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp | |
| parent | 9d65631f5de153b50331d9f63225fe60ba70f8bc (diff) | |
| parent | 93e6a48b3e876708a8161a9946581f5e8ebb382f (diff) | |
| download | frameworks_native-3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1.zip frameworks_native-3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1.tar.gz frameworks_native-3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1.tar.bz2 | |
am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Diffstat (limited to 'opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp')
| -rwxr-xr-x | opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp | 2 |
1 files changed, 1 insertions, 1 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; } |