Merge "Regenerate all the OpenGL stubs." (ebd397ad) · Commits · e / os / android_frameworks_base

core/jni/android_opengl_EGL14.cpp

+22 −22

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ android_eglGetError
		(JNIEnv *_env, jobject _this) {
		EGLint _returnValue = (EGLint) 0;
		_returnValue = eglGetError();
		return _returnValue;
		return (jint)_returnValue;
		}

		/* EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id ) */
		@@ -230,7 +230,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglTerminate ( EGLDisplay dpy ) */
		@@ -243,7 +243,7 @@ android_eglTerminate
		_returnValue = eglTerminate(
		(EGLDisplay)dpy_native
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* const char * eglQueryString ( EGLDisplay dpy, EGLint name ) */
		@@ -331,7 +331,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglChooseConfig ( EGLDisplay dpy, const EGLint attrib_list, EGLConfig configs, EGLint config_size, EGLint num_config ) /
		@@ -454,7 +454,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglGetConfigAttrib ( EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint value ) /
		@@ -509,7 +509,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLSurface eglCreateWindowSurface ( EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint attrib_list ) /
		@@ -753,7 +753,7 @@ android_eglDestroySurface
		(EGLDisplay)dpy_native,
		(EGLSurface)surface_native
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglQuerySurface ( EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value ) /
		@@ -808,7 +808,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglBindAPI ( EGLenum api ) */
		@@ -819,7 +819,7 @@ android_eglBindAPI
		_returnValue = eglBindAPI(
		(EGLenum)api
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLenum eglQueryAPI ( void ) */
		@@ -828,7 +828,7 @@ android_eglQueryAPI
		(JNIEnv *_env, jobject _this) {
		EGLenum _returnValue = (EGLenum) 0;
		_returnValue = eglQueryAPI();
		return _returnValue;
		return (jint)_returnValue;
		}

		/* EGLBoolean eglWaitClient ( void ) */
		@@ -837,7 +837,7 @@ android_eglWaitClient
		(JNIEnv *_env, jobject _this) {
		EGLBoolean _returnValue = (EGLBoolean) 0;
		_returnValue = eglWaitClient();
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglReleaseThread ( void ) */
		@@ -846,7 +846,7 @@ android_eglReleaseThread
		(JNIEnv *_env, jobject _this) {
		EGLBoolean _returnValue = (EGLBoolean) 0;
		_returnValue = eglReleaseThread();
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLSurface eglCreatePbufferFromClientBuffer ( EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint attrib_list ) /
		@@ -927,7 +927,7 @@ android_eglSurfaceAttrib
		(EGLint)attribute,
		(EGLint)value
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglBindTexImage ( EGLDisplay dpy, EGLSurface surface, EGLint buffer ) */
		@@ -943,7 +943,7 @@ android_eglBindTexImage
		(EGLSurface)surface_native,
		(EGLint)buffer
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglReleaseTexImage ( EGLDisplay dpy, EGLSurface surface, EGLint buffer ) */
		@@ -959,7 +959,7 @@ android_eglReleaseTexImage
		(EGLSurface)surface_native,
		(EGLint)buffer
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglSwapInterval ( EGLDisplay dpy, EGLint interval ) */
		@@ -973,7 +973,7 @@ android_eglSwapInterval
		(EGLDisplay)dpy_native,
		(EGLint)interval
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLContext eglCreateContext ( EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint attrib_list ) /
		@@ -1052,7 +1052,7 @@ android_eglDestroyContext
		(EGLDisplay)dpy_native,
		(EGLContext)ctx_native
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglMakeCurrent ( EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx ) */
		@@ -1071,7 +1071,7 @@ android_eglMakeCurrent
		(EGLSurface)read_native,
		(EGLContext)ctx_native
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLContext eglGetCurrentContext ( void ) */
		@@ -1155,7 +1155,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglWaitGL ( void ) */
		@@ -1164,7 +1164,7 @@ android_eglWaitGL
		(JNIEnv *_env, jobject _this) {
		EGLBoolean _returnValue = (EGLBoolean) 0;
		_returnValue = eglWaitGL();
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglWaitNative ( EGLint engine ) */
		@@ -1175,7 +1175,7 @@ android_eglWaitNative
		_returnValue = eglWaitNative(
		(EGLint)engine
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglSwapBuffers ( EGLDisplay dpy, EGLSurface surface ) */
		@@ -1190,7 +1190,7 @@ android_eglSwapBuffers
		(EGLDisplay)dpy_native,
		(EGLSurface)surface_native
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* EGLBoolean eglCopyBuffers ( EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target ) */

core/jni/android_opengl_GLES10.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,
		glVertexAttribPointer(indx, size, type, normalized, stride, pointer);
		}
		#endif
		#ifdef GL_ES_VERSION_3_0
		static void glVertexAttribIPointerBounds(GLuint indx, GLint size, GLenum type,
		GLsizei stride, const GLvoid *pointer, GLsizei count) {
		glVertexAttribIPointer(indx, size, type, stride, pointer);
		}
		#endif
		}

		/* Cache method IDs each time the class is loaded. */
		@@ -1184,7 +1190,7 @@ android_glGetError__
		(JNIEnv *_env, jobject _this) {
		GLenum _returnValue;
		_returnValue = glGetError();
		return _returnValue;
		return (jint)_returnValue;
		}

		/* void glGetIntegerv ( GLenum pname, GLint params ) /

core/jni/android_opengl_GLES10Ext.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,
		glVertexAttribPointer(indx, size, type, normalized, stride, pointer);
		}
		#endif
		#ifdef GL_ES_VERSION_3_0
		static void glVertexAttribIPointerBounds(GLuint indx, GLint size, GLenum type,
		GLsizei stride, const GLvoid *pointer, GLsizei count) {
		glVertexAttribIPointer(indx, size, type, stride, pointer);
		}
		#endif
		}

		/* Cache method IDs each time the class is loaded. */
		@@ -395,7 +401,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jint)_returnValue;
		}

		/* GLbitfield glQueryMatrixxOES ( GLfixed mantissa, GLint exponent ) */
		@@ -452,7 +458,7 @@ exit:
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		}
		return _returnValue;
		return (jint)_returnValue;
		}

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

core/jni/android_opengl_GLES11.cpp

+14 −8

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,
		glVertexAttribPointer(indx, size, type, normalized, stride, pointer);
		}
		#endif
		#ifdef GL_ES_VERSION_3_0
		static void glVertexAttribIPointerBounds(GLuint indx, GLint size, GLenum type,
		GLsizei stride, const GLvoid *pointer, GLsizei count) {
		glVertexAttribIPointer(indx, size, type, stride, pointer);
		}
		#endif
		}

		/* Cache method IDs each time the class is loaded. */
		@@ -571,7 +577,7 @@ android_glColorPointer__IIII
		(GLint)size,
		(GLenum)type,
		(GLsizei)stride,
		(const GLvoid *)offset
		(GLvoid *)offset
		);
		}

		@@ -672,7 +678,7 @@ android_glDrawElements__IIII
		(GLenum)mode,
		(GLsizei)count,
		(GLenum)type,
		(const GLvoid *)offset
		(GLvoid *)offset
		);
		if (_exception) {
		jniThrowException(_env, _exceptionType, _exceptionMessage);
		@@ -2263,7 +2269,7 @@ android_glIsBuffer__I
		_returnValue = glIsBuffer(
		(GLuint)buffer
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* GLboolean glIsEnabled ( GLenum cap ) */
		@@ -2274,7 +2280,7 @@ android_glIsEnabled__I
		_returnValue = glIsEnabled(
		(GLenum)cap
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* GLboolean glIsTexture ( GLuint texture ) */
		@@ -2285,7 +2291,7 @@ android_glIsTexture__I
		_returnValue = glIsTexture(
		(GLuint)texture
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* void glNormalPointer ( GLenum type, GLsizei stride, GLint offset ) */
		@@ -2295,7 +2301,7 @@ android_glNormalPointer__III
		glNormalPointer(
		(GLenum)type,
		(GLsizei)stride,
		(const GLvoid *)offset
		(GLvoid *)offset
		);
		}

		@@ -2522,7 +2528,7 @@ android_glTexCoordPointer__IIII
		(GLint)size,
		(GLenum)type,
		(GLsizei)stride,
		(const GLvoid *)offset
		(GLvoid *)offset
		);
		}

		@@ -2930,7 +2936,7 @@ android_glVertexPointer__IIII
		(GLint)size,
		(GLenum)type,
		(GLsizei)stride,
		(const GLvoid *)offset
		(GLvoid *)offset
		);
		}

core/jni/android_opengl_GLES11Ext.cpp

+9 −3

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,
		glVertexAttribPointer(indx, size, type, normalized, stride, pointer);
		}
		#endif
		#ifdef GL_ES_VERSION_3_0
		static void glVertexAttribIPointerBounds(GLuint indx, GLint size, GLenum type,
		GLsizei stride, const GLvoid *pointer, GLsizei count) {
		glVertexAttribIPointer(indx, size, type, stride, pointer);
		}
		#endif
		}

		/* Cache method IDs each time the class is loaded. */
		@@ -2129,7 +2135,7 @@ android_glIsRenderbufferOES__I
		_returnValue = glIsRenderbufferOES(
		(GLuint)renderbuffer
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* void glBindRenderbufferOES ( GLenum target, GLuint renderbuffer ) */
		@@ -2422,7 +2428,7 @@ android_glIsFramebufferOES__I
		_returnValue = glIsFramebufferOES(
		(GLuint)framebuffer
		);
		return _returnValue;
		return (jboolean)_returnValue;
		}

		/* void glBindFramebufferOES ( GLenum target, GLuint framebuffer ) */
		@@ -2615,7 +2621,7 @@ android_glCheckFramebufferStatusOES__I
		_returnValue = glCheckFramebufferStatusOES(
		(GLenum)target
		);
		return _returnValue;
		return (jint)_returnValue;
		}

		/* void glFramebufferRenderbufferOES ( GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer ) */