diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-06 02:16:51 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-06 02:16:51 +0200 |
| commit | cb3dc68691f4d01426c7abdd9e7bc16f8d461a9f (patch) | |
| tree | 66106f966a36721c37c1e22221e85110cbefa255 /libvo/gl_common.h | |
| parent | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (diff) | |
| parent | c6ef66231818b90c75f84b9407730647c93f040c (diff) | |
| download | mpv-cb3dc68691f4d01426c7abdd9e7bc16f8d461a9f.tar.bz2 mpv-cb3dc68691f4d01426c7abdd9e7bc16f8d461a9f.tar.xz | |
Merge svn changes up to r28103
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index fbcd49db88..2fcb8568ad 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -210,6 +210,15 @@ #ifndef GL_UNSIGNED_SHORT_1_5_5_5_REV #define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 #endif +#ifndef GL_UNSIGNED_SHORT_8_8 +#define GL_UNSIGNED_SHORT_8_8 0x85BA +#endif +#ifndef GL_UNSIGNED_SHORT_8_8_REV +#define GL_UNSIGNED_SHORT_8_8_REV 0x85BB +#endif +#ifndef GL_YCBCR_MESA +#define GL_YCBCR_MESA 0x8757 +#endif #ifndef GL_RGB32F #define GL_RGB32F 0x8815 #endif @@ -375,5 +384,7 @@ extern void (APIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat, extern int (APIENTRY *SwapInterval)(int); extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +extern void* (APIENTRY *AllocateMemoryMESA)(void *, int, size_t, float, float, float); +extern void (APIENTRY *FreeMemoryMESA)(void *, int, void *); #endif /* MPLAYER_GL_COMMON_H */ |