diff options
| author | Jesse Hall <jessehall@google.com> | 2014-12-02 00:42:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 00:42:23 +0000 |
| commit | 414fd6fc7a1023a1ca5843e14e7634dfaf255a54 (patch) | |
| tree | d9aeda95fcf3271b71ccc5cd6ca757707e5e82bd /opengl | |
| parent | e4ea03f74ded76f588501bd2e90ecb767c6426b3 (diff) | |
| parent | 4aaa39358f538d8e06e026385bb8be8088d78c35 (diff) | |
| download | frameworks_native-414fd6fc7a1023a1ca5843e14e7634dfaf255a54.zip frameworks_native-414fd6fc7a1023a1ca5843e14e7634dfaf255a54.tar.gz frameworks_native-414fd6fc7a1023a1ca5843e14e7634dfaf255a54.tar.bz2 | |
am 4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '4aaa39358f538d8e06e026385bb8be8088d78c35':
Avoid overwriting EGL14.EGL_NO_SURFACE
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp index 9bd2ca4..4df61d3 100644 --- a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp @@ -85,23 +85,19 @@ nativeClassInit(JNIEnv *_env, jclass glImplClass) eglsurfaceConstructor = _env->GetMethodID(eglsurfaceClass, "<init>", "(J)V"); eglconfigConstructor = _env->GetMethodID(eglconfigClass, "<init>", "(J)V"); - jobject localeglNoContextObject = _env->NewObject(eglcontextClass, eglcontextConstructor, reinterpret_cast<jlong>(EGL_NO_CONTEXT)); - eglNoContextObject = _env->NewGlobalRef(localeglNoContextObject); - jobject localeglNoDisplayObject = _env->NewObject(egldisplayClass, egldisplayConstructor, reinterpret_cast<jlong>(EGL_NO_DISPLAY)); - eglNoDisplayObject = _env->NewGlobalRef(localeglNoDisplayObject); - jobject localeglNoSurfaceObject = _env->NewObject(eglsurfaceClass, eglsurfaceConstructor, reinterpret_cast<jlong>(EGL_NO_SURFACE)); - eglNoSurfaceObject = _env->NewGlobalRef(localeglNoSurfaceObject); - jclass eglClass = _env->FindClass("android/opengl/EGL14"); jfieldID noContextFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_CONTEXT", "Landroid/opengl/EGLContext;"); - _env->SetStaticObjectField(eglClass, noContextFieldID, eglNoContextObject); + jobject localeglNoContextObject = _env->GetStaticObjectField(eglClass, noContextFieldID); + eglNoContextObject = _env->NewGlobalRef(localeglNoContextObject); jfieldID noDisplayFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_DISPLAY", "Landroid/opengl/EGLDisplay;"); - _env->SetStaticObjectField(eglClass, noDisplayFieldID, eglNoDisplayObject); + jobject localeglNoDisplayObject = _env->GetStaticObjectField(eglClass, noDisplayFieldID); + eglNoDisplayObject = _env->NewGlobalRef(localeglNoDisplayObject); jfieldID noSurfaceFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_SURFACE", "Landroid/opengl/EGLSurface;"); - _env->SetStaticObjectField(eglClass, noSurfaceFieldID, eglNoSurfaceObject); + jobject localeglNoSurfaceObject = _env->GetStaticObjectField(eglClass, noSurfaceFieldID); + eglNoSurfaceObject = _env->NewGlobalRef(localeglNoSurfaceObject); } static void * |