From 17fdb480d082aa6e9c6ebe3c2f7d970f27a0e321 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sun, 13 Jan 2013 00:09:33 +1100 Subject: [PATCH] [646/906] some gl header fixes/additions --- gst-libs/gst/gl/glprototypes/gles1.h | 4 ++-- gst-libs/gst/gl/glprototypes/gles1gles2opengl.h | 6 +++--- gst-libs/gst/gl/glprototypes/gles1opengl.h | 4 ++++ gst-libs/gst/gl/glprototypes/gles2opengl.h | 10 +++++----- gst-libs/gst/gl/glprototypes/opengl.h | 21 +++++++++++++++++++++ 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/gst-libs/gst/gl/glprototypes/gles1.h b/gst-libs/gst/gl/glprototypes/gles1.h index 24470d9..174cf63 100644 --- a/gst-libs/gst/gl/glprototypes/gles1.h +++ b/gst-libs/gst/gl/glprototypes/gles1.h @@ -43,5 +43,5 @@ GST_GL_EXT_BEGIN (only_in_gles1, GST_GL_API_GLES, "\0", "\0") -COGL_EXT_FUNCTION (void, ClipPlanef, (GLenum plane, const GLfloat *equation)) -COGL_EXT_END () +GST_GL_EXT_FUNCTION (void, ClipPlanef, (GLenum plane, const GLfloat *equation)) +GST_GL_EXT_END () diff --git a/gst-libs/gst/gl/glprototypes/gles1gles2opengl.h b/gst-libs/gst/gl/glprototypes/gles1gles2opengl.h index bb52acc..b4cf62d 100644 --- a/gst-libs/gst/gl/glprototypes/gles1gles2opengl.h +++ b/gst-libs/gst/gl/glprototypes/gles1gles2opengl.h @@ -100,7 +100,7 @@ GST_GL_EXT_FUNCTION (void, CullFace, (GLenum mode)) GST_GL_EXT_FUNCTION (void, GenTextures, (GLsizei n, GLuint* textures)) -GST_GL_EXT_FUNCTION (GLenum, glGetError, +GST_GL_EXT_FUNCTION (GLenum, GetError, (void)) GST_GL_EXT_FUNCTION (void, GetIntegerv, (GLenum pname, GLint* params)) @@ -112,7 +112,7 @@ GST_GL_EXT_FUNCTION (const GLubyte*, GetString, (GLenum name)) GST_GL_EXT_FUNCTION (void, Hint, (GLenum target, GLenum mode)) -GST_GL_EXT_FUNCTION (GLboolean, glIsTexture, +GST_GL_EXT_FUNCTION (GLboolean, IsTexture, (GLuint texture)) GST_GL_EXT_FUNCTION (void, PixelStorei, (GLenum pname, GLint param)) @@ -173,7 +173,7 @@ GST_GL_EXT_FUNCTION (void, CopyTexImage2D, GLint border)) GST_GL_EXT_FUNCTION (void, Viewport, (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, PolygonOffset, (GLfloat factor, GLfloat units)) GST_GL_EXT_END () diff --git a/gst-libs/gst/gl/glprototypes/gles1opengl.h b/gst-libs/gst/gl/glprototypes/gles1opengl.h index 5c97c2a..c371a77 100644 --- a/gst-libs/gst/gl/glprototypes/gles1opengl.h +++ b/gst-libs/gst/gl/glprototypes/gles1opengl.h @@ -98,4 +98,8 @@ GST_GL_EXT_FUNCTION (void, VertexPointer, GLenum type, GLsizei stride, const GLvoid *pointer)) +GST_GL_EXT_FUNCTION (void, PushMatrix, + (void)) +GST_GL_EXT_FUNCTION (void, PopMatrix, + (void)) GST_GL_EXT_END () diff --git a/gst-libs/gst/gl/glprototypes/gles2opengl.h b/gst-libs/gst/gl/glprototypes/gles2opengl.h index c8dbea1..7f09188 100644 --- a/gst-libs/gst/gl/glprototypes/gles2opengl.h +++ b/gst-libs/gst/gl/glprototypes/gles2opengl.h @@ -39,7 +39,7 @@ */ GST_GL_EXT_BEGIN (offscreen, - 255, 255, + 3, 0, GST_GL_API_GLES2, /* for some reason the ARB version of this extension doesn't have an ARB suffix for the @@ -192,9 +192,9 @@ GST_GL_EXT_FUNCTION (void, GetAttachedShaders, GLsizei maxcount, GLsizei* count, GLuint* shaders)) -GST_GL_EXT_FUNCTION (GLboolean, glIsShader, +GST_GL_EXT_FUNCTION (GLboolean, IsShader, (GLuint shader)) -GST_GL_EXT_FUNCTION (GLboolean, glIsProgram, +GST_GL_EXT_FUNCTION (GLboolean, IsProgram, (GLuint program)) GST_GL_EXT_END () @@ -321,7 +321,7 @@ GST_GL_EXT_FUNCTION (void, GetShaderSource, GLsizei bufsize, GLsizei* length, GLchar* source)) -GST_GL_EXT_FUNCTION (void, glValidateProgram, (GLuint program)) +GST_GL_EXT_FUNCTION (void, ValidateProgram, (GLuint program)) GST_GL_EXT_END () /* 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)) GST_GL_EXT_FUNCTION (void, GetVertexAttribPointerv, (GLuint index, GLenum pname, GLvoid** pointer)) -GST_GL_EXT_FUNCTION (GLint, glGetAttribLocation, +GST_GL_EXT_FUNCTION (GLint, GetAttribLocation, (GLuint program, const char *name)) GST_GL_EXT_FUNCTION (void, BindAttribLocation, (GLuint program, diff --git a/gst-libs/gst/gl/glprototypes/opengl.h b/gst-libs/gst/gl/glprototypes/opengl.h index fbcb931..9688bc3 100644 --- a/gst-libs/gst/gl/glprototypes/opengl.h +++ b/gst-libs/gst/gl/glprototypes/opengl.h @@ -131,3 +131,24 @@ GST_GL_EXT_FUNCTION (void, ProgramLocalParameter4fv, GLfloat *params)) 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 () -- 2.7.4