ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Narayan Kamath 2014-02-27 13:29:42 +00:00 committed by Android Git Automerger
parent c5e2442e59 3e599252c0
commit 2c95c57b62
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp
View File

@ -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;
}

3
opengl/tools/glgen/stubs/egl/eglGetDisplay.java
View File

@ -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}
*/