[646/906] some gl header fixes/additions

This commit is contained in:
Matthew Waters 2013-01-13 00:09:33 +11:00
parent fcfe6b90a9
commit 2f21abac2e
5 changed files with 35 additions and 10 deletions

View file

@ -43,5 +43,5 @@ GST_GL_EXT_BEGIN (only_in_gles1,
GST_GL_API_GLES, GST_GL_API_GLES,
"\0", "\0",
"\0") "\0")
COGL_EXT_FUNCTION (void, ClipPlanef, (GLenum plane, const GLfloat *equation)) GST_GL_EXT_FUNCTION (void, ClipPlanef, (GLenum plane, const GLfloat *equation))
COGL_EXT_END () GST_GL_EXT_END ()

View file

@ -100,7 +100,7 @@ GST_GL_EXT_FUNCTION (void, CullFace,
(GLenum mode)) (GLenum mode))
GST_GL_EXT_FUNCTION (void, GenTextures, GST_GL_EXT_FUNCTION (void, GenTextures,
(GLsizei n, GLuint* textures)) (GLsizei n, GLuint* textures))
GST_GL_EXT_FUNCTION (GLenum, glGetError, GST_GL_EXT_FUNCTION (GLenum, GetError,
(void)) (void))
GST_GL_EXT_FUNCTION (void, GetIntegerv, GST_GL_EXT_FUNCTION (void, GetIntegerv,
(GLenum pname, GLint* params)) (GLenum pname, GLint* params))
@ -112,7 +112,7 @@ GST_GL_EXT_FUNCTION (const GLubyte*, GetString,
(GLenum name)) (GLenum name))
GST_GL_EXT_FUNCTION (void, Hint, GST_GL_EXT_FUNCTION (void, Hint,
(GLenum target, GLenum mode)) (GLenum target, GLenum mode))
GST_GL_EXT_FUNCTION (GLboolean, glIsTexture, GST_GL_EXT_FUNCTION (GLboolean, IsTexture,
(GLuint texture)) (GLuint texture))
GST_GL_EXT_FUNCTION (void, PixelStorei, GST_GL_EXT_FUNCTION (void, PixelStorei,
(GLenum pname, GLint param)) (GLenum pname, GLint param))
@ -173,7 +173,7 @@ GST_GL_EXT_FUNCTION (void, CopyTexImage2D,
GLint border)) GLint border))
GST_GL_EXT_FUNCTION (void, Viewport, GST_GL_EXT_FUNCTION (void, Viewport,
(GLint x, GLint y, GLsizei width, GLsizei height)) (GLint x, GLint y, GLsizei width, GLsizei height))
GST_GL_EXT_FUNCTION (GLboolean, glIsEnabled, (GLenum cap)) GST_GL_EXT_FUNCTION (GLboolean, IsEnabled, (GLenum cap))
GST_GL_EXT_FUNCTION (void, LineWidth, (GLfloat width)) GST_GL_EXT_FUNCTION (void, LineWidth, (GLfloat width))
GST_GL_EXT_FUNCTION (void, PolygonOffset, (GLfloat factor, GLfloat units)) GST_GL_EXT_FUNCTION (void, PolygonOffset, (GLfloat factor, GLfloat units))
GST_GL_EXT_END () GST_GL_EXT_END ()

View file

@ -98,4 +98,8 @@ GST_GL_EXT_FUNCTION (void, VertexPointer,
GLenum type, GLenum type,
GLsizei stride, GLsizei stride,
const GLvoid *pointer)) const GLvoid *pointer))
GST_GL_EXT_FUNCTION (void, PushMatrix,
(void))
GST_GL_EXT_FUNCTION (void, PopMatrix,
(void))
GST_GL_EXT_END () GST_GL_EXT_END ()

View file

@ -39,7 +39,7 @@
*/ */
GST_GL_EXT_BEGIN (offscreen, GST_GL_EXT_BEGIN (offscreen,
255, 255, 3, 0,
GST_GL_API_GLES2, GST_GL_API_GLES2,
/* for some reason the ARB version of this /* for some reason the ARB version of this
extension doesn't have an ARB suffix for the extension doesn't have an ARB suffix for the
@ -192,9 +192,9 @@ GST_GL_EXT_FUNCTION (void, GetAttachedShaders,
GLsizei maxcount, GLsizei maxcount,
GLsizei* count, GLsizei* count,
GLuint* shaders)) GLuint* shaders))
GST_GL_EXT_FUNCTION (GLboolean, glIsShader, GST_GL_EXT_FUNCTION (GLboolean, IsShader,
(GLuint shader)) (GLuint shader))
GST_GL_EXT_FUNCTION (GLboolean, glIsProgram, GST_GL_EXT_FUNCTION (GLboolean, IsProgram,
(GLuint program)) (GLuint program))
GST_GL_EXT_END () GST_GL_EXT_END ()
@ -321,7 +321,7 @@ GST_GL_EXT_FUNCTION (void, GetShaderSource,
GLsizei bufsize, GLsizei bufsize,
GLsizei* length, GLsizei* length,
GLchar* source)) GLchar* source))
GST_GL_EXT_FUNCTION (void, glValidateProgram, (GLuint program)) GST_GL_EXT_FUNCTION (void, ValidateProgram, (GLuint program))
GST_GL_EXT_END () GST_GL_EXT_END ()
/* These functions are provided by GL_ARB_vertex_shader or are in GL /* These functions are provided by GL_ARB_vertex_shader or are in GL
@ -361,7 +361,7 @@ GST_GL_EXT_FUNCTION (void, GetVertexAttribiv,
(GLuint index, GLenum pname, GLint* params)) (GLuint index, GLenum pname, GLint* params))
GST_GL_EXT_FUNCTION (void, GetVertexAttribPointerv, GST_GL_EXT_FUNCTION (void, GetVertexAttribPointerv,
(GLuint index, GLenum pname, GLvoid** pointer)) (GLuint index, GLenum pname, GLvoid** pointer))
GST_GL_EXT_FUNCTION (GLint, glGetAttribLocation, GST_GL_EXT_FUNCTION (GLint, GetAttribLocation,
(GLuint program, const char *name)) (GLuint program, const char *name))
GST_GL_EXT_FUNCTION (void, BindAttribLocation, GST_GL_EXT_FUNCTION (void, BindAttribLocation,
(GLuint program, (GLuint program,

View file

@ -131,3 +131,24 @@ GST_GL_EXT_FUNCTION (void, ProgramLocalParameter4fv,
GLfloat *params)) GLfloat *params))
GST_GL_EXT_END () GST_GL_EXT_END ()
GST_GL_EXT_BEGIN (fixed_function_gl_only,
0, 0,
0,
"\0",
"\0")
GST_GL_EXT_FUNCTION (void, PushAttrib,
(GLbitfield mask))
GST_GL_EXT_FUNCTION (void, PopAttrib,
(void))
GST_GL_EXT_FUNCTION (void, TexImage1D,
(GLenum target,
GLint level,
GLint internalFormat,
GLsizei width,
GLint border,
GLenum format,
GLenum type,
const GLvoid *data))
GST_GL_EXT_FUNCTION (void, Rotatef,
(GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
GST_GL_EXT_END ()