Merge "Re-run glgen/gen" (91c4cd65) · Commits · e / os / android_frameworks_base

core/jni/android_opengl_EGL14.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -335,7 +335,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -455,7 +455,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -511,7 +511,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -806,7 +806,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -1161,7 +1161,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -1207,7 +1207,7 @@ android_eglCopyBuffers
		(JNIEnv *_env, jobject _this, jobject dpy, jobject surface, jint target) {
		jniThrowException(_env, "java/lang/UnsupportedOperationException",
		"eglCopyBuffers");
		return (EGLBoolean) 0;
		return JNI_FALSE;
		}

		static const char *classPathName = "android/opengl/EGL14";

core/jni/android_opengl_EGL15.cpp

+9 −13

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		** limitations under the License.
		*/

		// This source file is automatically generated

		#pragma GCC diagnostic ignored "-Wunused-variable"
		#pragma GCC diagnostic ignored "-Wunused-function"

		@@ -90,7 +92,6 @@ nativeClassInit(JNIEnv *_env, jclass glImplClass)
		egldisplayGetHandleID = _env->GetMethodID(egldisplayClass, "getNativeHandle", "()J");
		eglsurfaceGetHandleID = _env->GetMethodID(eglsurfaceClass, "getNativeHandle", "()J");


		eglconfigConstructor = _env->GetMethodID(eglconfigClass, "<init>", "(J)V");
		eglcontextConstructor = _env->GetMethodID(eglcontextClass, "<init>", "(J)V");
		egldisplayConstructor = _env->GetMethodID(egldisplayClass, "<init>", "(J)V");
		@@ -103,7 +104,6 @@ nativeClassInit(JNIEnv *_env, jclass glImplClass)
		jobject localeglNoSurfaceObject = _env->NewObject(eglsurfaceClass, eglsurfaceConstructor, reinterpret_cast<jlong>(EGL_NO_SURFACE));
		eglNoSurfaceObject = _env->NewGlobalRef(localeglNoSurfaceObject);


		jclass eglClass = _env->FindClass("android/opengl/EGL15");
		jfieldID noContextFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_CONTEXT", "Landroid/opengl/EGLContext;");
		_env->SetStaticObjectField(eglClass, noContextFieldID, eglNoContextObject);
		@@ -199,8 +199,7 @@ fromEGLHandle(JNIEnv *_env, jmethodID mid, jobject obj) {

		static jobject
		toEGLHandle(JNIEnv _env, jclass cls, jmethodID con, void handle) {
		if (cls == eglimageClass &&
		(EGLImage)handle == EGL_NO_IMAGE) {
		if (cls == eglimageClass && (EGLImage)handle == EGL_NO_IMAGE) {
		return eglNoImageObject;
		}

		@@ -333,7 +332,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return false;
		return JNI_FALSE;
		}
		return (jboolean)_returnValue;
		}
		@@ -457,13 +456,10 @@ exit:
		static jobject
		android_eglCreatePlatformPixmapSurface
		(JNIEnv *_env, jobject _this, jobject dpy, jobject config, jobject native_pixmap_buf, jlongArray attrib_list_ref, jint offset) {
		if ((true)) {
		jniThrowException(_env, "java/lang/UnsupportedOperationException",
		"eglCreatePlatformPixmapSurface");
		return nullptr;
		}
		return toEGLHandle(_env, eglsurfaceClass, eglsurfaceConstructor, (EGLSurface) 0);
		}

		/* EGLBoolean eglWaitSync ( EGLDisplay dpy, EGLSync sync, EGLint flags ) */
		static jboolean

core/jni/android_opengl_EGLExt.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ fromEGLHandle(JNIEnv *_env, jmethodID mid, jobject obj) {
		if (obj == NULL){
		jniThrowException(_env, "java/lang/IllegalArgumentException",
		"Object is set to null.");
		return nullptr;
		}

		return reinterpret_cast<void*>(_env->CallLongMethod(obj, mid));

core/jni/android_opengl_GLES10Ext.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -529,6 +529,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return (jint)0;
		}
		return (jint)_returnValue;
		}
		@@ -598,6 +599,7 @@ exit:
		}
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return (jint)0;
		}
		return (jint)_returnValue;
		}

core/jni/android_opengl_GLES20.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -2682,6 +2682,7 @@ exit:

		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return (jint)0;
		}
		return (jint)_returnValue;
		}
		@@ -3907,6 +3908,7 @@ exit:

		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		return (jint)0;
		}
		return (jint)_returnValue;
		}