Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ebd397ad: Merge "Regenerate all the OpenGL stubs."

Browse Source 
* commit 'ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
  Regenerate all the OpenGL stubs.
This commit is contained in:
Elliott Hughes
2013-09-27 15:37:56 -07:00
committed by Android Git Automerger
parent 19f9f445bf ebd397ad91
commit 82e5d8758a
10 changed files with 102 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/jni/android_opengl_EGL14.cpp
View File

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

8
core/jni/android_opengl_GLES10.cpp
View File

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

10
core/jni/android_opengl_GLES10Ext.cpp
View File

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

22
core/jni/android_opengl_GLES11.cpp
View File

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

12
core/jni/android_opengl_GLES11Ext.cpp
View File

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

39
core/jni/android_opengl_GLES20.cpp
View File

@@ -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. */
@@ -346,6 +352,7 @@ android_glBindAttribLocation__IILjava_lang_String_2
const char* _nativename = 0;
if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null";
goto exit;
@@ -549,7 +556,7 @@ android_glCheckFramebufferStatus__I
_returnValue = glCheckFramebufferStatus(
(GLenum)target
);
return _returnValue;
return (jint)_returnValue;
}
/* void glClear ( GLbitfield mask ) */
@@ -709,7 +716,7 @@ android_glCreateProgram__
(JNIEnv *_env, jobject _this) {
GLuint _returnValue;
_returnValue = glCreateProgram();
return _returnValue;
return (jint)_returnValue;
}
/* GLuint glCreateShader ( GLenum type ) */
@@ -720,7 +727,7 @@ android_glCreateShader__I
_returnValue = glCreateShader(
(GLenum)type
);
return _returnValue;
return (jint)_returnValue;
}
/* void glCullFace ( GLenum mode ) */
@@ -1172,7 +1179,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
(const GLvoid *)offset
(GLvoid *)offset
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -2447,6 +2454,7 @@ android_glGetAttribLocation__ILjava_lang_String_2
const char* _nativename = 0;
if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null";
goto exit;
@@ -2466,7 +2474,7 @@ exit:
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
return _returnValue;
return (jint)_returnValue;
}
/* void glGetBooleanv ( GLenum pname, GLboolean *params ) */
@@ -2576,7 +2584,7 @@ android_glGetError__
(JNIEnv *_env, jobject _this) {
GLenum _returnValue;
_returnValue = glGetError();
return _returnValue;
return (jint)_returnValue;
}
/* void glGetFloatv ( GLenum pname, GLfloat *params ) */
@@ -3595,6 +3603,7 @@ android_glGetUniformLocation__ILjava_lang_String_2
const char* _nativename = 0;
if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null";
goto exit;
@@ -3614,7 +3623,7 @@ exit:
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
return _returnValue;
return (jint)_returnValue;
}
/* void glGetVertexAttribfv ( GLuint index, GLenum pname, GLfloat *params ) */
@@ -3855,7 +3864,7 @@ android_glIsBuffer__I
_returnValue = glIsBuffer(
(GLuint)buffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsEnabled ( GLenum cap ) */
@@ -3866,7 +3875,7 @@ android_glIsEnabled__I
_returnValue = glIsEnabled(
(GLenum)cap
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsFramebuffer ( GLuint framebuffer ) */
@@ -3877,7 +3886,7 @@ android_glIsFramebuffer__I
_returnValue = glIsFramebuffer(
(GLuint)framebuffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsProgram ( GLuint program ) */
@@ -3888,7 +3897,7 @@ android_glIsProgram__I
_returnValue = glIsProgram(
(GLuint)program
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsRenderbuffer ( GLuint renderbuffer ) */
@@ -3899,7 +3908,7 @@ android_glIsRenderbuffer__I
_returnValue = glIsRenderbuffer(
(GLuint)renderbuffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsShader ( GLuint shader ) */
@@ -3910,7 +3919,7 @@ android_glIsShader__I
_returnValue = glIsShader(
(GLuint)shader
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsTexture ( GLuint texture ) */
@@ -3921,7 +3930,7 @@ android_glIsTexture__I
_returnValue = glIsTexture(
(GLuint)texture
);
return _returnValue;
return (jboolean)_returnValue;
}
/* void glLineWidth ( GLfloat width ) */
@@ -5975,7 +5984,7 @@ android_glVertexAttribPointer__IIIZII
(GLenum)type,
(GLboolean)normalized,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}

2
core/jni/android_opengl_GLES30.cpp
View File

@@ -2510,6 +2510,7 @@ android_glGetFragDataLocation__ILjava_lang_String_2
const char* _nativename = 0;
if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null";
goto exit;
@@ -3360,6 +3361,7 @@ android_glGetUniformBlockIndex__ILjava_lang_String_2
const char* _nativeuniformBlockName = 0;
if (!uniformBlockName) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformBlockName == null";
goto exit;

32
core/jni/com_google_android_gles_jni_GLImpl.cpp
View File

@@ -1181,7 +1181,7 @@ android_glGetError__
(JNIEnv *_env, jobject _this) {
GLenum _returnValue;
_returnValue = glGetError();
return _returnValue;
return (jint)_returnValue;
}
/* void glGetIntegerv ( GLenum pname, GLint *params ) */
@@ -4017,7 +4017,7 @@ exit:
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
return _returnValue;
return (jint)_returnValue;
}
/* GLbitfield glQueryMatrixxOES ( GLfixed *mantissa, GLint *exponent ) */
@@ -4074,7 +4074,7 @@ exit:
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
return _returnValue;
return (jint)_returnValue;
}
/* void glBindBuffer ( GLenum target, GLuint buffer ) */
@@ -4359,7 +4359,7 @@ android_glColorPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -4460,7 +4460,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
(const GLvoid *)offset
(GLvoid *)offset
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -6067,7 +6067,7 @@ android_glIsBuffer__I
_returnValue = glIsBuffer(
(GLuint)buffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsEnabled ( GLenum cap ) */
@@ -6078,7 +6078,7 @@ android_glIsEnabled__I
_returnValue = glIsEnabled(
(GLenum)cap
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsTexture ( GLuint texture ) */
@@ -6089,7 +6089,7 @@ android_glIsTexture__I
_returnValue = glIsTexture(
(GLuint)texture
);
return _returnValue;
return (jboolean)_returnValue;
}
/* void glNormalPointer ( GLenum type, GLsizei stride, GLint offset ) */
@@ -6099,7 +6099,7 @@ android_glNormalPointer__III
glNormalPointer(
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -6326,7 +6326,7 @@ android_glTexCoordPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -6756,7 +6756,7 @@ android_glVertexPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -7196,7 +7196,7 @@ android_glMatrixIndexPointerOES__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -7232,7 +7232,7 @@ android_glWeightPointerOES__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(const GLvoid *)offset
(GLvoid *)offset
);
}
@@ -7325,7 +7325,7 @@ android_glCheckFramebufferStatusOES__I
_returnValue = glCheckFramebufferStatusOES(
(GLint)target
);
return _returnValue;
return (jint)_returnValue;
}
/* void glDeleteFramebuffersOES ( GLint n, GLuint *framebuffers ) */
@@ -8166,7 +8166,7 @@ android_glIsFramebufferOES__I
_returnValue = glIsFramebufferOES(
(GLint)framebuffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* GLboolean glIsRenderbufferOES ( GLint renderbuffer ) */
@@ -8182,7 +8182,7 @@ android_glIsRenderbufferOES__I
_returnValue = glIsRenderbufferOES(
(GLint)renderbuffer
);
return _returnValue;
return (jboolean)_returnValue;
}
/* void glRenderbufferStorageOES ( GLint target, GLint internalformat, GLint width, GLint height ) */

1
opengl/java/android/opengl/EGL14.java
View File

@@ -1,5 +1,4 @@
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");

1
opengl/java/android/opengl/EGLExt.java
View File

@@ -1,5 +1,4 @@
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");