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

Commit a3d66a83 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

minor modifications to the official GLES 2.x headers 

- changed glTexImage2D() declaration so it matches that of GLES 1.x; otherwise we can't include both headers (!!!)
- added parameter names to the declaration of some extensions (this is needed by glapigen and glentrygen)
parent 48efd950

opengl/include/GLES2/gl2.h

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); 
GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);

GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);

GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);

GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);

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

GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);

GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);

GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);

opengl/include/GLES2/gl2ext.h

+7 −7
Original line number Diff line number Diff line
@@ -470,13 +470,13 @@ typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monito 
#ifndef GL_NV_fence

#define GL_NV_fence 1

#ifdef GL_GLEXT_PROTOTYPES

GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);

GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *);

GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint);

GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint);

GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);

GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint);

GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum);

GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);

GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);

GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);

GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);

GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);

GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint fence);

GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);

#endif

typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);

typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);