diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:36:05 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:36:05 +0200 |
| commit | b390b9b28fa6280f355eeef4811b6cfc02dea01a (patch) | |
| tree | ef67be7ab1b189f5818fb8a273fa10f19d19aec6 /libvo/gl_common.c | |
| parent | efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (diff) | |
| parent | 8e778e501948b67b1f8cd889e68242d1a1eb6041 (diff) | |
| download | mpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.bz2 mpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.xz | |
Merge svn changes up to r30185
Diffstat (limited to 'libvo/gl_common.c')
| -rw-r--r-- | libvo/gl_common.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index b6bef7f1b7..a411c00eb2 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -41,8 +41,10 @@ void (GLAPIENTRY *End)(void); void (GLAPIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei); void (GLAPIENTRY *MatrixMode)(GLenum); void (GLAPIENTRY *LoadIdentity)(void); +void (GLAPIENTRY *Translated)(double, double, double); void (GLAPIENTRY *Scaled)(double, double, double); void (GLAPIENTRY *Ortho)(double, double, double, double, double, double); +void (GLAPIENTRY *Frustum)(double, double, double, double, double, double); void (GLAPIENTRY *PushMatrix)(void); void (GLAPIENTRY *PopMatrix)(void); void (GLAPIENTRY *Clear)(GLbitfield); @@ -54,10 +56,14 @@ void (GLAPIENTRY *CallList)(GLuint); void (GLAPIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *); void (GLAPIENTRY *GenTextures)(GLsizei, GLuint *); void (GLAPIENTRY *DeleteTextures)(GLsizei, const GLuint *); +void (GLAPIENTRY *TexEnvf)(GLenum, GLenum, GLfloat); void (GLAPIENTRY *TexEnvi)(GLenum, GLenum, GLint); void (GLAPIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte); void (GLAPIENTRY *Color3f)(GLfloat, GLfloat, GLfloat); +void (GLAPIENTRY *Color4f)(GLfloat, GLfloat, GLfloat, GLfloat); void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf); +void (GLAPIENTRY *ClearDepth)(GLclampd); +void (GLAPIENTRY *DepthFunc)(GLenum); void (GLAPIENTRY *Enable)(GLenum); void (GLAPIENTRY *Disable)(GLenum); const GLubyte *(GLAPIENTRY *GetString)(GLenum); @@ -75,6 +81,11 @@ void (GLAPIENTRY *TexParameterf)(GLenum, GLenum, GLfloat); void (GLAPIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *); void (GLAPIENTRY *TexCoord2f)(GLfloat, GLfloat); void (GLAPIENTRY *Vertex2f)(GLfloat, GLfloat); +void (GLAPIENTRY *Vertex3f)(GLfloat, GLfloat, GLfloat); +void (GLAPIENTRY *Normal3f)(GLfloat, GLfloat, GLfloat); +void (GLAPIENTRY *Lightfv)(GLenum, GLenum, const GLfloat *); +void (GLAPIENTRY *ColorMaterial)(GLenum, GLenum); +void (GLAPIENTRY *ShadeModel)(GLenum); void (GLAPIENTRY *GetIntegerv)(GLenum, GLint *); /** @@ -359,8 +370,10 @@ static const extfunc_desc_t extfuncs[] = { DEF_FUNC_DESC(Viewport), DEF_FUNC_DESC(MatrixMode), DEF_FUNC_DESC(LoadIdentity), + DEF_FUNC_DESC(Translated), DEF_FUNC_DESC(Scaled), DEF_FUNC_DESC(Ortho), + DEF_FUNC_DESC(Frustum), DEF_FUNC_DESC(PushMatrix), DEF_FUNC_DESC(PopMatrix), DEF_FUNC_DESC(Clear), @@ -372,10 +385,14 @@ static const extfunc_desc_t extfuncs[] = { DEF_FUNC_DESC(CallLists), DEF_FUNC_DESC(GenTextures), DEF_FUNC_DESC(DeleteTextures), + DEF_FUNC_DESC(TexEnvf), DEF_FUNC_DESC(TexEnvi), DEF_FUNC_DESC(Color4ub), DEF_FUNC_DESC(Color3f), + DEF_FUNC_DESC(Color4f), DEF_FUNC_DESC(ClearColor), + DEF_FUNC_DESC(ClearDepth), + DEF_FUNC_DESC(DepthFunc), DEF_FUNC_DESC(Enable), DEF_FUNC_DESC(Disable), DEF_FUNC_DESC(DrawBuffer), @@ -392,6 +409,11 @@ static const extfunc_desc_t extfuncs[] = { DEF_FUNC_DESC(TexParameterfv), DEF_FUNC_DESC(TexCoord2f), DEF_FUNC_DESC(Vertex2f), + DEF_FUNC_DESC(Vertex3f), + DEF_FUNC_DESC(Normal3f), + DEF_FUNC_DESC(Lightfv), + DEF_FUNC_DESC(ColorMaterial), + DEF_FUNC_DESC(ShadeModel), DEF_FUNC_DESC(GetIntegerv), // here start the real extensions |