Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1186d58 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Revert "opengl: Generate *.in from registry XML""

parents e585fddf 0b96e6c4

opengl/include/GLES/glext.h

+2 −2
Original line number Diff line number Diff line
@@ -1056,10 +1056,10 @@ typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum 
#define GL_EXT_multi_draw_arrays 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei);

GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* const*, GLsizei);

GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);

#endif /* GL_GLEXT_PROTOTYPES */

typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);

typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const*indices, GLsizei primcount);

typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);

#endif



/* GL_EXT_read_format_bgra */

opengl/libs/GLES2/gl2_api.in

+180 −180

File changed.

Preview size limit exceeded, changes collapsed.

opengl/libs/GLES2/gl2ext_api.in

+107 −338

File changed.

Preview size limit exceeded, changes collapsed.

opengl/libs/GLES_CM/gl_api.in

+93 −90
Original line number Diff line number Diff line 
void API_ENTRY(glAlphaFunc)(GLenum func, GLfloat ref) {

void API_ENTRY(glAlphaFunc)(GLenum func, GLclampf ref) {

    CALL_GL_API(glAlphaFunc, func, ref);

}

void API_ENTRY(glClearColor)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) {

void API_ENTRY(glClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {

    CALL_GL_API(glClearColor, red, green, blue, alpha);

}

void API_ENTRY(glClearDepthf)(GLfloat d) {

    CALL_GL_API(glClearDepthf, d);

void API_ENTRY(glClearDepthf)(GLclampf depth) {

    CALL_GL_API(glClearDepthf, depth);

}

void API_ENTRY(glClipPlanef)(GLenum p, const GLfloat * eqn) {

    CALL_GL_API(glClipPlanef, p, eqn);

void API_ENTRY(glClipPlanef)(GLenum plane, const GLfloat *equation) {

    CALL_GL_API(glClipPlanef, plane, equation);

}

void API_ENTRY(glColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) {

    CALL_GL_API(glColor4f, red, green, blue, alpha);

}

void API_ENTRY(glDepthRangef)(GLfloat n, GLfloat f) {

    CALL_GL_API(glDepthRangef, n, f);

void API_ENTRY(glDepthRangef)(GLclampf zNear, GLclampf zFar) {

    CALL_GL_API(glDepthRangef, zNear, zFar);

}

void API_ENTRY(glFogf)(GLenum pname, GLfloat param) {

    CALL_GL_API(glFogf, pname, param);
@@ -22,14 +22,14 @@ void API_ENTRY(glFogf)(GLenum pname, GLfloat param) { 
void API_ENTRY(glFogfv)(GLenum pname, const GLfloat *params) {

    CALL_GL_API(glFogfv, pname, params);

}

void API_ENTRY(glFrustumf)(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f) {

    CALL_GL_API(glFrustumf, l, r, b, t, n, f);

void API_ENTRY(glFrustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) {

    CALL_GL_API(glFrustumf, left, right, bottom, top, zNear, zFar);

}

void API_ENTRY(glGetClipPlanef)(GLenum plane, GLfloat * equation) {

    CALL_GL_API(glGetClipPlanef, plane, equation);

void API_ENTRY(glGetClipPlanef)(GLenum pname, GLfloat eqn[4]) {

    CALL_GL_API(glGetClipPlanef, pname, eqn);

}

void API_ENTRY(glGetFloatv)(GLenum pname, GLfloat * data) {

    CALL_GL_API(glGetFloatv, pname, data);

void API_ENTRY(glGetFloatv)(GLenum pname, GLfloat *params) {

    CALL_GL_API(glGetFloatv, pname, params);

}

void API_ENTRY(glGetLightfv)(GLenum light, GLenum pname, GLfloat *params) {

    CALL_GL_API(glGetLightfv, light, pname, params);
@@ -37,8 +37,8 @@ void API_ENTRY(glGetLightfv)(GLenum light, GLenum pname, GLfloat * params) { 
void API_ENTRY(glGetMaterialfv)(GLenum face, GLenum pname, GLfloat *params) {

    CALL_GL_API(glGetMaterialfv, face, pname, params);

}

void API_ENTRY(glGetTexEnvfv)(GLenum target, GLenum pname, GLfloat * params) {

    CALL_GL_API(glGetTexEnvfv, target, pname, params);

void API_ENTRY(glGetTexEnvfv)(GLenum env, GLenum pname, GLfloat *params) {

    CALL_GL_API(glGetTexEnvfv, env, pname, params);

}

void API_ENTRY(glGetTexParameterfv)(GLenum target, GLenum pname, GLfloat *params) {

    CALL_GL_API(glGetTexParameterfv, target, pname, params);
@@ -76,8 +76,8 @@ void API_ENTRY(glMultiTexCoord4f)(GLenum target, GLfloat s, GLfloat t, GLfloat r 
void API_ENTRY(glNormal3f)(GLfloat nx, GLfloat ny, GLfloat nz) {

    CALL_GL_API(glNormal3f, nx, ny, nz);

}

void API_ENTRY(glOrthof)(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f) {

    CALL_GL_API(glOrthof, l, r, b, t, n, f);

void API_ENTRY(glOrthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) {

    CALL_GL_API(glOrthof, left, right, bottom, top, zNear, zFar);

}

void API_ENTRY(glPointParameterf)(GLenum pname, GLfloat param) {

    CALL_GL_API(glPointParameterf, pname, param);
@@ -115,7 +115,7 @@ void API_ENTRY(glTranslatef)(GLfloat x, GLfloat y, GLfloat z) { 
void API_ENTRY(glActiveTexture)(GLenum texture) {

    CALL_GL_API(glActiveTexture, texture);

}

void API_ENTRY(glAlphaFuncx)(GLenum func, GLfixed ref) {

void API_ENTRY(glAlphaFuncx)(GLenum func, GLclampx ref) {

    CALL_GL_API(glAlphaFuncx, func, ref);

}

void API_ENTRY(glBindBuffer)(GLenum target, GLuint buffer) {
@@ -127,19 +127,19 @@ void API_ENTRY(glBindTexture)(GLenum target, GLuint texture) { 
void API_ENTRY(glBlendFunc)(GLenum sfactor, GLenum dfactor) {

    CALL_GL_API(glBlendFunc, sfactor, dfactor);

}

void API_ENTRY(glBufferData)(GLenum target, GLsizeiptr size, const void * data, GLenum usage) {

void API_ENTRY(glBufferData)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage) {

    CALL_GL_API(glBufferData, target, size, data, usage);

}

void API_ENTRY(glBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const void * data) {

void API_ENTRY(glBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data) {

    CALL_GL_API(glBufferSubData, target, offset, size, data);

}

void API_ENTRY(glClear)(GLbitfield mask) {

    CALL_GL_API(glClear, mask);

}

void API_ENTRY(glClearColorx)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) {

void API_ENTRY(glClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) {

    CALL_GL_API(glClearColorx, red, green, blue, alpha);

}

void API_ENTRY(glClearDepthx)(GLfixed depth) {

void API_ENTRY(glClearDepthx)(GLclampx depth) {

    CALL_GL_API(glClearDepthx, depth);

}

void API_ENTRY(glClearStencil)(GLint s) {
@@ -160,13 +160,13 @@ void API_ENTRY(glColor4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alph 
void API_ENTRY(glColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) {

    CALL_GL_API(glColorMask, red, green, blue, alpha);

}

void API_ENTRY(glColorPointer)(GLint size, GLenum type, GLsizei stride, const void * pointer) {

void API_ENTRY(glColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) {

    CALL_GL_API(glColorPointer, size, type, stride, pointer);

}

void API_ENTRY(glCompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void * data) {

void API_ENTRY(glCompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data) {

    CALL_GL_API(glCompressedTexImage2D, target, level, internalformat, width, height, border, imageSize, data);

}

void API_ENTRY(glCompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void * data) {

void API_ENTRY(glCompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data) {

    CALL_GL_API(glCompressedTexSubImage2D, target, level, xoffset, yoffset, width, height, format, imageSize, data);

}

void API_ENTRY(glCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) {
@@ -190,8 +190,8 @@ void API_ENTRY(glDepthFunc)(GLenum func) { 
void API_ENTRY(glDepthMask)(GLboolean flag) {

    CALL_GL_API(glDepthMask, flag);

}

void API_ENTRY(glDepthRangex)(GLfixed n, GLfixed f) {

    CALL_GL_API(glDepthRangex, n, f);

void API_ENTRY(glDepthRangex)(GLclampx zNear, GLclampx zFar) {

    CALL_GL_API(glDepthRangex, zNear, zFar);

}

void API_ENTRY(glDisable)(GLenum cap) {

    CALL_GL_API(glDisable, cap);
@@ -202,7 +202,7 @@ void API_ENTRY(glDisableClientState)(GLenum array) { 
void API_ENTRY(glDrawArrays)(GLenum mode, GLint first, GLsizei count) {

    CALL_GL_API(glDrawArrays, mode, first, count);

}

void API_ENTRY(glDrawElements)(GLenum mode, GLsizei count, GLenum type, const void * indices) {

void API_ENTRY(glDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) {

    CALL_GL_API(glDrawElements, mode, count, type, indices);

}

void API_ENTRY(glEnable)(GLenum cap) {
@@ -220,23 +220,23 @@ void API_ENTRY(glFlush)(void) { 
void API_ENTRY(glFogx)(GLenum pname, GLfixed param) {

    CALL_GL_API(glFogx, pname, param);

}

void API_ENTRY(glFogxv)(GLenum pname, const GLfixed * param) {

    CALL_GL_API(glFogxv, pname, param);

void API_ENTRY(glFogxv)(GLenum pname, const GLfixed *params) {

    CALL_GL_API(glFogxv, pname, params);

}

void API_ENTRY(glFrontFace)(GLenum mode) {

    CALL_GL_API(glFrontFace, mode);

}

void API_ENTRY(glFrustumx)(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f) {

    CALL_GL_API(glFrustumx, l, r, b, t, n, f);

void API_ENTRY(glFrustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) {

    CALL_GL_API(glFrustumx, left, right, bottom, top, zNear, zFar);

}

void API_ENTRY(glGetBooleanv)(GLenum pname, GLboolean * data) {

    CALL_GL_API(glGetBooleanv, pname, data);

void API_ENTRY(glGetBooleanv)(GLenum pname, GLboolean *params) {

    CALL_GL_API(glGetBooleanv, pname, params);

}

void API_ENTRY(glGetBufferParameteriv)(GLenum target, GLenum pname, GLint *params) {

    CALL_GL_API(glGetBufferParameteriv, target, pname, params);

}

void API_ENTRY(glGetClipPlanex)(GLenum plane, GLfixed * equation) {

    CALL_GL_API(glGetClipPlanex, plane, equation);

void API_ENTRY(glGetClipPlanex)(GLenum pname, GLfixed eqn[4]) {

    CALL_GL_API(glGetClipPlanex, pname, eqn);

}

void API_ENTRY(glGenBuffers)(GLsizei n, GLuint *buffers) {

    CALL_GL_API(glGenBuffers, n, buffers);
@@ -250,8 +250,8 @@ GLenum API_ENTRY(glGetError)(void) { 
void API_ENTRY(glGetFixedv)(GLenum pname, GLfixed *params) {

    CALL_GL_API(glGetFixedv, pname, params);

}

void API_ENTRY(glGetIntegerv)(GLenum pname, GLint * data) {

    CALL_GL_API(glGetIntegerv, pname, data);

void API_ENTRY(glGetIntegerv)(GLenum pname, GLint *params) {

    CALL_GL_API(glGetIntegerv, pname, params);

}

void API_ENTRY(glGetLightxv)(GLenum light, GLenum pname, GLfixed *params) {

    CALL_GL_API(glGetLightxv, light, pname, params);
@@ -259,17 +259,17 @@ void API_ENTRY(glGetLightxv)(GLenum light, GLenum pname, GLfixed * params) { 
void API_ENTRY(glGetMaterialxv)(GLenum face, GLenum pname, GLfixed *params) {

    CALL_GL_API(glGetMaterialxv, face, pname, params);

}

void API_ENTRY(glGetPointerv)(GLenum pname, void ** params) {

void API_ENTRY(glGetPointerv)(GLenum pname, GLvoid **params) {

    CALL_GL_API(glGetPointerv, pname, params);

}

const GLubyte * API_ENTRY(__glGetString)(GLenum name) {

    CALL_GL_API_RETURN(glGetString, name);

}

void API_ENTRY(glGetTexEnviv)(GLenum target, GLenum pname, GLint * params) {

    CALL_GL_API(glGetTexEnviv, target, pname, params);

void API_ENTRY(glGetTexEnviv)(GLenum env, GLenum pname, GLint *params) {

    CALL_GL_API(glGetTexEnviv, env, pname, params);

}

void API_ENTRY(glGetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params) {

    CALL_GL_API(glGetTexEnvxv, target, pname, params);

void API_ENTRY(glGetTexEnvxv)(GLenum env, GLenum pname, GLfixed *params) {

    CALL_GL_API(glGetTexEnvxv, env, pname, params);

}

void API_ENTRY(glGetTexParameteriv)(GLenum target, GLenum pname, GLint *params) {

    CALL_GL_API(glGetTexParameteriv, target, pname, params);
@@ -292,8 +292,8 @@ GLboolean API_ENTRY(glIsTexture)(GLuint texture) { 
void API_ENTRY(glLightModelx)(GLenum pname, GLfixed param) {

    CALL_GL_API(glLightModelx, pname, param);

}

void API_ENTRY(glLightModelxv)(GLenum pname, const GLfixed * param) {

    CALL_GL_API(glLightModelxv, pname, param);

void API_ENTRY(glLightModelxv)(GLenum pname, const GLfixed *params) {

    CALL_GL_API(glLightModelxv, pname, params);

}

void API_ENTRY(glLightx)(GLenum light, GLenum pname, GLfixed param) {

    CALL_GL_API(glLightx, light, pname, param);
@@ -316,8 +316,8 @@ void API_ENTRY(glLogicOp)(GLenum opcode) { 
void API_ENTRY(glMaterialx)(GLenum face, GLenum pname, GLfixed param) {

    CALL_GL_API(glMaterialx, face, pname, param);

}

void API_ENTRY(glMaterialxv)(GLenum face, GLenum pname, const GLfixed * param) {

    CALL_GL_API(glMaterialxv, face, pname, param);

void API_ENTRY(glMaterialxv)(GLenum face, GLenum pname, const GLfixed *params) {

    CALL_GL_API(glMaterialxv, face, pname, params);

}

void API_ENTRY(glMatrixMode)(GLenum mode) {

    CALL_GL_API(glMatrixMode, mode);
@@ -325,17 +325,17 @@ void API_ENTRY(glMatrixMode)(GLenum mode) { 
void API_ENTRY(glMultMatrixx)(const GLfixed *m) {

    CALL_GL_API(glMultMatrixx, m);

}

void API_ENTRY(glMultiTexCoord4x)(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) {

    CALL_GL_API(glMultiTexCoord4x, texture, s, t, r, q);

void API_ENTRY(glMultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q) {

    CALL_GL_API(glMultiTexCoord4x, target, s, t, r, q);

}

void API_ENTRY(glNormal3x)(GLfixed nx, GLfixed ny, GLfixed nz) {

    CALL_GL_API(glNormal3x, nx, ny, nz);

}

void API_ENTRY(glNormalPointer)(GLenum type, GLsizei stride, const void * pointer) {

void API_ENTRY(glNormalPointer)(GLenum type, GLsizei stride, const GLvoid *pointer) {

    CALL_GL_API(glNormalPointer, type, stride, pointer);

}

void API_ENTRY(glOrthox)(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f) {

    CALL_GL_API(glOrthox, l, r, b, t, n, f);

void API_ENTRY(glOrthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) {

    CALL_GL_API(glOrthox, left, right, bottom, top, zNear, zFar);

}

void API_ENTRY(glPixelStorei)(GLenum pname, GLint param) {

    CALL_GL_API(glPixelStorei, pname, param);
@@ -358,13 +358,13 @@ void API_ENTRY(glPopMatrix)(void) { 
void API_ENTRY(glPushMatrix)(void) {

    CALL_GL_API(glPushMatrix);

}

void API_ENTRY(glReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void * pixels) {

void API_ENTRY(glReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) {

    CALL_GL_API(glReadPixels, x, y, width, height, format, type, pixels);

}

void API_ENTRY(glRotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) {

    CALL_GL_API(glRotatex, angle, x, y, z);

}

void API_ENTRY(glSampleCoverage)(GLfloat value, GLboolean invert) {

void API_ENTRY(glSampleCoverage)(GLclampf value, GLboolean invert) {

    CALL_GL_API(glSampleCoverage, value, invert);

}

void API_ENTRY(glSampleCoveragex)(GLclampx value, GLboolean invert) {
@@ -388,7 +388,7 @@ void API_ENTRY(glStencilMask)(GLuint mask) { 
void API_ENTRY(glStencilOp)(GLenum fail, GLenum zfail, GLenum zpass) {

    CALL_GL_API(glStencilOp, fail, zfail, zpass);

}

void API_ENTRY(glTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const void * pointer) {

void API_ENTRY(glTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) {

    CALL_GL_API(glTexCoordPointer, size, type, stride, pointer);

}

void API_ENTRY(glTexEnvi)(GLenum target, GLenum pname, GLint param) {
@@ -403,7 +403,7 @@ void API_ENTRY(glTexEnviv)(GLenum target, GLenum pname, const GLint * params) { 
void API_ENTRY(glTexEnvxv)(GLenum target, GLenum pname, const GLfixed *params) {

    CALL_GL_API(glTexEnvxv, target, pname, params);

}

void API_ENTRY(glTexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void * pixels) {

void API_ENTRY(glTexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) {

    CALL_GL_API(glTexImage2D, target, level, internalformat, width, height, border, format, type, pixels);

}

void API_ENTRY(glTexParameteri)(GLenum target, GLenum pname, GLint param) {
@@ -418,15 +418,18 @@ void API_ENTRY(glTexParameteriv)(GLenum target, GLenum pname, const GLint * para 
void API_ENTRY(glTexParameterxv)(GLenum target, GLenum pname, const GLfixed *params) {

    CALL_GL_API(glTexParameterxv, target, pname, params);

}

void API_ENTRY(glTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void * pixels) {

void API_ENTRY(glTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels) {

    CALL_GL_API(glTexSubImage2D, target, level, xoffset, yoffset, width, height, format, type, pixels);

}

void API_ENTRY(glTranslatex)(GLfixed x, GLfixed y, GLfixed z) {

    CALL_GL_API(glTranslatex, x, y, z);

}

void API_ENTRY(glVertexPointer)(GLint size, GLenum type, GLsizei stride, const void * pointer) {

void API_ENTRY(glVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) {

    CALL_GL_API(glVertexPointer, size, type, stride, pointer);

}

void API_ENTRY(glViewport)(GLint x, GLint y, GLsizei width, GLsizei height) {

    CALL_GL_API(glViewport, x, y, width, height);

}

void API_ENTRY(glPointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid *pointer) {

    CALL_GL_API(glPointSizePointerOES, type, stride, pointer);

}

opengl/libs/GLES_CM/glext_api.in

+120 −222

File changed.

Preview size limit exceeded, changes collapsed.