Mercurial > mplayer.hg
annotate libvo/gl_common.h @ 14178:69d9d9ec86da
Sync with 1.823: Mention how to concatenate files with -vo yuv4mpeg and -fixed-vo.
+ back to my way of maintaining the date field (for now)
author | gpoirier |
---|---|
date | Fri, 17 Dec 2004 22:33:30 +0000 |
parents | f0c1ee83b216 |
children | 629c54dc7e0d |
rev | line source |
---|---|
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
1 #ifndef __GL_COMMON_H__ |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
2 #define __GL_COMMON_H__ |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
3 |
13843 | 4 #include "mp_msg.h" |
5 #include "config.h" | |
6 | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
7 #include <GL/gl.h> |
13843 | 8 #include "video_out.h" |
9 | |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
10 #ifdef GL_WIN32 |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
11 #include <windows.h> |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
12 #include <GL/glext.h> |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
13 #include "w32_common.h" |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
14 #else |
13843 | 15 #include <X11/Xlib.h> |
16 #include <GL/glx.h> | |
17 #include "x11_common.h" | |
18 #endif | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
19 |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
20 void glAdjustAlignment(int stride); |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
21 |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13921
diff
changeset
|
22 const char *glValName(GLint value); |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13921
diff
changeset
|
23 |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13921
diff
changeset
|
24 int glFindFormat(uint32_t format, uint32_t *bpp, GLenum *gl_texfmt, |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13921
diff
changeset
|
25 GLenum *gl_format, GLenum *gl_type); |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13921
diff
changeset
|
26 |
13843 | 27 //! could not set new window, will continue drawing into the old one. |
28 #define SET_WINDOW_FAILED -1 | |
29 //! new window is set, could even transfer the OpenGL context. | |
30 #define SET_WINDOW_OK 0 | |
31 //! new window is set, but the OpenGL context needs to be reinitialized. | |
32 #define SET_WINDOW_REINIT 1 | |
33 | |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
34 #ifdef GL_WIN32 |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
35 int setGlWindow(int *vinfo, HGLRC *context, HWND win); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
36 void releaseGlContext(int *vinfo, HGLRC *context); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14078
diff
changeset
|
37 #else |
13843 | 38 int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); |
13921 | 39 void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff
changeset
|
40 #endif |
13843 | 41 |
42 #endif |