annotate libvo/vo_gl.c @ 28065:aec8703ff07f

Avoid one more duplicated logic.
author reimar
date Fri, 05 Dec 2008 20:56:49 +0000
parents 4d76c7e31760
children 7511f7328d93
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 #include <string.h>
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
4 #include <math.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
6 #include "config.h"
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
7 #include "mp_msg.h"
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
8 #include "subopt-helper.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #include "video_out_internal.h"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
11 #include "font_load.h"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
12 #include "sub.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
14 #include "gl_common.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2041
diff changeset
15 #include "aspect.h"
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27306
diff changeset
16 #ifdef CONFIG_GUI
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22489
diff changeset
17 #include "gui/interface.h"
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
18 #endif
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
19 #include "fastmemcpy.h"
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
20 #include "libass/ass.h"
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
21 #include "libass/ass_mp.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
22
25216
3aee342be929 Make vo info structs const
reimar
parents: 24787
diff changeset
23 static const vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
25 "X11 (OpenGL)",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
26 "gl",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
27 "Arpad Gereoffy <arpi@esp-team.scene.hu>",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
28 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
31 const LIBVO_EXTERN(gl)
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
32
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
33 #ifdef GL_WIN32
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
34 static int gl_vinfo = 0;
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
35 static HGLRC gl_context = 0;
21631
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 21506
diff changeset
36 #define update_xinerama_info w32_update_xinerama_info
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 21506
diff changeset
37 #define vo_init vo_w32_init
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 21506
diff changeset
38 #define vo_window vo_w32_window
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
39 #else
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
40 static XVisualInfo *gl_vinfo = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
41 static GLXContext gl_context = 0;
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
42 static int wsGLXAttrib[] = { GLX_RGBA,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 GLX_RED_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 GLX_GREEN_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 GLX_BLUE_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 GLX_DOUBLEBUFFER,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 None };
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
48 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
50 static int use_osd;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
51 static int scaled_osd;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
52 //! How many parts the OSD may consist of at most
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
53 #define MAX_OSD_PARTS 20
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
54 //! Textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
55 static GLuint osdtex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
56 #ifndef FAST_OSD
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
57 //! Alpha textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
58 static GLuint osdatex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
59 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
60 static GLuint *eosdtex;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
61 static GLuint largeeosdtex[2];
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
62 //! Display lists that draw the OSD parts
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
63 static GLuint osdDispList[MAX_OSD_PARTS];
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
64 #ifndef FAST_OSD
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
65 static GLuint osdaDispList[MAX_OSD_PARTS];
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
66 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
67 static GLuint eosdDispList;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
68 //! How many parts the OSD currently consists of
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
69 static int osdtexCnt;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
70 static int eosdtexCnt;
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
71 static int osd_color;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
73 static int use_aspect;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
74 static int use_ycbcr;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
75 static int use_yuv;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
76 static int lscale;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
77 static int cscale;
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
78 static float filter_strength;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
79 static int yuvconvtype;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
80 static int use_rectangle;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
81 static int err_shown;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static uint32_t image_height;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
84 static uint32_t image_format;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
85 static int many_fmts;
26677
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
86 static int ati_hack;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
87 static int force_pbo;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
88 static int use_glFinish;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
89 static int swap_interval;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
90 static GLenum gl_target;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16282
diff changeset
91 static GLint gl_texfmt;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
92 static GLenum gl_format;
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
93 static GLenum gl_type;
16434
db8d8039a5f4 gl_buffer should be unsigned
reimar
parents: 16433
diff changeset
94 static GLuint gl_buffer;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
95 static GLuint gl_buffer_uv[2];
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
96 static int gl_buffersize;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
97 static int gl_buffersize_uv;
23987
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
98 static void *gl_bufferptr;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
99 static void *gl_bufferptr_uv[2];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
100 static GLuint fragprog;
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
101 static GLuint default_texs[22];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
102 static char *custom_prog;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
103 static char *custom_tex;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
104 static int custom_tlin;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
105 static int custom_trect;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
107 static int int_pause;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
108 static int eq_bri = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
109 static int eq_cont = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
110 static int eq_sat = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
111 static int eq_hue = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
112 static int eq_rgamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
113 static int eq_ggamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
114 static int eq_bgamma = 0;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
115
16879
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
116 static int texture_width;
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
117 static int texture_height;
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
118 static int mpi_flipped;
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
119 static int vo_flipped;
22149
7b4f17dc2689 Avoid calling aspect on each frame and make ass subtitles work better with panscan
reimar
parents: 22087
diff changeset
120 static int ass_border_x, ass_border_y;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
122 static unsigned int slice_height = 1;
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
123
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
124 static void redraw(void);
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
125
612
77e0094f0cce some warnings killed
szabii
parents: 384
diff changeset
126 static void resize(int x,int y){
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
127 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
128 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
129 int top = 0, left = 0, w = x, h = y;
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
130 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight);
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
131 glViewport(top, left, w, h);
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
132 } else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 glViewport( 0, 0, x, y );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 glMatrixMode(GL_PROJECTION);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 glLoadIdentity();
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
137 if (vo_fs && use_aspect) {
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
138 int new_w, new_h;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
139 GLdouble scale_x, scale_y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
140 aspect(&new_w, &new_h, A_ZOOM);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
141 panscan_calc();
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
142 new_w += vo_panscan_x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
143 new_h += vo_panscan_y;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
144 scale_x = (GLdouble)new_w / (GLdouble)x;
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
145 scale_y = (GLdouble)new_h / (GLdouble)y;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
146 glScaled(scale_x, scale_y, 1);
22149
7b4f17dc2689 Avoid calling aspect on each frame and make ass subtitles work better with panscan
reimar
parents: 22087
diff changeset
147 ass_border_x = (vo_screenwidth - new_w) / 2;
7b4f17dc2689 Avoid calling aspect on each frame and make ass subtitles work better with panscan
reimar
parents: 22087
diff changeset
148 ass_border_y = (vo_screenheight - new_h) / 2;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
149 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 glOrtho(0, image_width, image_height, 0, -1,1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 glMatrixMode(GL_MODELVIEW);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 glLoadIdentity();
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
154
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
155 if (!scaled_osd) {
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27343
diff changeset
156 #ifdef CONFIG_FREETYPE
15086
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
157 // adjust font size to display size
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
158 force_load_font = 1;
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
159 #endif
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
160 vo_osd_changed(OSDTYPE_OSD);
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
161 }
25911
851db1ed62b4 Always redraw video on resize.
reimar
parents: 25754
diff changeset
162 glClear(GL_COLOR_BUFFER_BIT);
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
163 redraw();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
166 static void texSize(int w, int h, int *texw, int *texh) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
167 if (use_rectangle) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
168 *texw = w; *texh = h;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
169 } else {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
170 *texw = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
171 while (*texw < w)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
172 *texw *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
173 *texh = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
174 while (*texh < h)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
175 *texh *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
176 }
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
177 if (ati_hack) *texw = (*texw + 511) & ~511;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
178 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
179
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16593
diff changeset
180 //! maximum size of custom fragment program
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
181 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024)
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
182 static void update_yuvconv(void) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
183 float bri = eq_bri / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
184 float cont = (eq_cont + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
185 float hue = eq_hue / 100.0 * 3.1415927;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
186 float sat = (eq_sat + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
187 float rgamma = exp(log(8.0) * eq_rgamma / 100.0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
188 float ggamma = exp(log(8.0) * eq_ggamma / 100.0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
189 float bgamma = exp(log(8.0) * eq_bgamma / 100.0);
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26823
diff changeset
190 gl_conversion_params_t params = {gl_target, yuvconvtype,
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26823
diff changeset
191 bri, cont, hue, sat, rgamma, ggamma, bgamma,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
192 texture_width, texture_height, filter_strength};
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26823
diff changeset
193 glSetupYUVConversion(&params);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
194 if (custom_prog) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
195 FILE *f = fopen(custom_prog, "r");
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
196 if (!f)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
197 mp_msg(MSGT_VO, MSGL_WARN,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
198 "[gl] Could not read customprog %s\n", custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
199 else {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
200 char *prog = calloc(1, MAX_CUSTOM_PROG_SIZE + 1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
201 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
202 fclose(f);
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18619
diff changeset
203 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
204 free(prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
205 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
206 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
207 1.0 / texture_width, 1.0 / texture_height,
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
208 texture_width, texture_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
209 }
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
210 if (custom_tex) {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
211 FILE *f = fopen(custom_tex, "r");
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
212 if (!f)
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
213 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
214 "[gl] Could not read customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
215 else {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
216 int width, height, maxval;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
217 ActiveTexture(GL_TEXTURE3);
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
218 if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0,
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
219 custom_tlin?GL_LINEAR:GL_NEAREST,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
220 f, &width, &height, &maxval))
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
221 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
222 1.0 / width, 1.0 / height, width, height);
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
223 else
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
224 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
225 "[gl] Error parsing customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
226 fclose(f);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
227 ActiveTexture(GL_TEXTURE0);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
228 }
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
229 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
230 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
231
16436
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
232 /**
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
233 * \brief remove all OSD textures and display-lists, thus clearing it.
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
234 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
235 static void clearOSD(void) {
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
236 int i;
17871
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
237 if (!osdtexCnt)
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
238 return;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
239 glDeleteTextures(osdtexCnt, osdtex);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
240 #ifndef FAST_OSD
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
241 glDeleteTextures(osdtexCnt, osdatex);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
242 for (i = 0; i < osdtexCnt; i++)
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
243 glDeleteLists(osdaDispList[i], 1);
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
244 #endif
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
245 for (i = 0; i < osdtexCnt; i++)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
246 glDeleteLists(osdDispList[i], 1);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
247 osdtexCnt = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
248 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
249
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
250 /**
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
251 * \brief remove textures, display list and free memory used by EOSD
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
252 */
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
253 static void clearEOSD(void) {
19934
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
254 if (eosdDispList)
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
255 glDeleteLists(eosdDispList, 1);
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
256 eosdDispList = 0;
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
257 if (eosdtexCnt)
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
258 glDeleteTextures(eosdtexCnt, eosdtex);
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
259 eosdtexCnt = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
260 free(eosdtex);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
261 eosdtex = NULL;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
262 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
263
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
264 /**
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
265 * \brief construct display list from ass image list
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
266 * \param img image list to create OSD from.
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
267 * A value of NULL has the same effect as clearEOSD()
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
268 */
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
269 static void genEOSD(mp_eosd_images_t *imgs) {
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
270 int sx, sy;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
271 int tinytexcur = 0;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
272 int smalltexcur = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
273 GLuint *curtex;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
274 GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
275 ass_image_t *img = imgs->imgs;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
276 ass_image_t *i;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
277
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
278 if (imgs->changed == 0) // there are elements, but they are unchanged
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
279 return;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
280 if (img && imgs->changed == 1) // there are elements, but they just moved
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
281 goto skip_upload;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
282
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
283 clearEOSD();
19935
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
284 if (!img)
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
285 return;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
286 if (!largeeosdtex[0]) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
287 glGenTextures(2, largeeosdtex);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
288 BindTexture(gl_target, largeeosdtex[0]);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
289 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, 512, 512, 0);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
290 BindTexture(gl_target, largeeosdtex[1]);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
291 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, 512, 512, 0);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
292 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
293 for (i = img; i; i = i->next)
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
294 {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
295 if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
296 continue;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
297 if (i->w < 16 && i->h < 16 && tinytexcur < 1024)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
298 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
299 else if (i->w < 32 && i->h < 32 && smalltexcur < 256)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
300 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
301 else
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
302 eosdtexCnt++;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
303 }
20084
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
304 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n",
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
305 tinytexcur, smalltexcur, eosdtexCnt);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
306 if (eosdtexCnt) {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
307 eosdtex = calloc(eosdtexCnt, sizeof(GLuint));
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
308 glGenTextures(eosdtexCnt, eosdtex);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
309 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
310 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
311 for (i = img, curtex = eosdtex; i; i = i->next) {
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
312 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
313 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
314 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
315 continue;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
316 }
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
317 if (i->w < 16 && i->h < 16 && tinytexcur < 1024) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
318 x = (tinytexcur & 31) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
319 y = (tinytexcur >> 5) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
320 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
321 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
322 } else if (i->w < 32 && i->h < 32 && smalltexcur < 256) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
323 x = (smalltexcur & 15) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
324 y = (smalltexcur >> 4) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
325 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
326 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
327 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
328 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
329 BindTexture(gl_target, *curtex++);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
330 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
331 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
332 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride,
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
333 x, y, i->w, i->h, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
334 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
335 eosdDispList = glGenLists(1);
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
336 skip_upload:
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
337 glNewList(eosdDispList, GL_COMPILE);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
338 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
339 for (i = img, curtex = eosdtex; i; i = i->next) {
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
340 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
341 if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
342 continue;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
343 glColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff));
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
344 if (i->w < 16 && i->h < 16 && tinytexcur < 1024) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
345 x = (tinytexcur & 31) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
346 y = (tinytexcur >> 5) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
347 sx = sy = 512;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
348 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
349 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
350 } else if (i->w < 32 && i->h < 32 && smalltexcur < 256) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
351 x = (smalltexcur & 15) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
352 y = (smalltexcur >> 4) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
353 sx = sy = 512;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
354 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
355 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
356 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
357 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
358 BindTexture(gl_target, *curtex++);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
359 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
360 glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
361 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
362 glEndList();
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
363 BindTexture(gl_target, 0);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
364 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
365
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
366 /**
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
367 * \brief uninitialize OpenGL context, freeing textures, buffers etc.
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
368 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
369 static void uninitGl(void) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
370 int i = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
371 if (DeletePrograms && fragprog)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
372 DeletePrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
373 fragprog = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
374 while (default_texs[i] != 0)
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
375 i++;
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
376 if (i)
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
377 glDeleteTextures(i, default_texs);
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
378 default_texs[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
379 clearOSD();
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
380 clearEOSD();
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
381 if (largeeosdtex[0])
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
382 glDeleteTextures(2, largeeosdtex);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
383 largeeosdtex[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
384 if (DeleteBuffers && gl_buffer)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
385 DeleteBuffers(1, &gl_buffer);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
386 gl_buffer = 0; gl_buffersize = 0;
23987
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
387 gl_bufferptr = NULL;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
388 if (DeleteBuffers && gl_buffer_uv[0])
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
389 DeleteBuffers(2, gl_buffer_uv);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
390 gl_buffer_uv[0] = gl_buffer_uv[1] = 0; gl_buffersize_uv = 0;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
391 gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
392 err_shown = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
393 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
394
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
395 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
396 * \brief Initialize a (new or reused) OpenGL context.
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
397 * set global gl-related variables to their default values
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
398 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
399 static int initGl(uint32_t d_width, uint32_t d_height) {
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
400 texSize(image_width, image_height, &texture_width, &texture_height);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
401
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
402 glDisable(GL_BLEND);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
403 glDisable(GL_DEPTH_TEST);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
404 glDepthMask(GL_FALSE);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
405 glDisable(GL_CULL_FACE);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
406 glEnable(gl_target);
16458
c35ed5cdf07e Respect -nodouble even though it looks very bad.
reimar
parents: 16436
diff changeset
407 glDrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT);
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
408 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
409
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
410 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
411 texture_width, texture_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
412
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
413 if (image_format == IMGFMT_YV12) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
414 int i;
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
415 glGenTextures(21, default_texs);
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
416 default_texs[21] = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
417 for (i = 0; i < 7; i++) {
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
418 ActiveTexture(GL_TEXTURE1 + i);
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
419 BindTexture(GL_TEXTURE_2D, default_texs[i]);
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
420 BindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]);
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
421 BindTexture(GL_TEXTURE_3D, default_texs[i + 14]);
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
422 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
423 ActiveTexture(GL_TEXTURE1);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
424 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
425 texture_width / 2, texture_height / 2, 128);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
426 ActiveTexture(GL_TEXTURE2);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
427 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
428 texture_width / 2, texture_height / 2, 128);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
429 switch (use_yuv) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
430 case YUV_CONVERSION_FRAGMENT_LOOKUP:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
431 case YUV_CONVERSION_FRAGMENT_POW:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
432 case YUV_CONVERSION_FRAGMENT:
18579
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
433 if (!GenPrograms || !BindProgram) {
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
434 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n");
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
435 break;
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
436 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
437 GenPrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
438 BindProgram(GL_FRAGMENT_PROGRAM, fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
439 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
440 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
441 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
442 BindTexture(gl_target, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
443 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
444 }
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
445 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR,
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
446 texture_width, texture_height, 0);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
447
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
448 resize(d_width, d_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
449
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
450 glClearColor( 0.0f,0.0f,0.0f,0.0f );
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
451 glClear( GL_COLOR_BUFFER_BIT );
16271
03884f9a35cc Do not set SwapInterval for values < 0.
reimar
parents: 16268
diff changeset
452 if (SwapInterval && swap_interval >= 0)
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
453 SwapInterval(swap_interval);
13920
4d4c6ac44d55 missing return for InitGl function
reimar
parents: 13871
diff changeset
454 return 1;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
455 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
456
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
457 /* connect to server, create and map window,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
458 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
459 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
460 static int
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
461 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
462 {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
463 image_height = height;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
464 image_width = width;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
465 image_format = format;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
466 glFindFormat(format, NULL, &gl_texfmt, &gl_format, &gl_type);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
467
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
468 int_pause = 0;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
469 vo_flipped = !!(flags & VOFLAG_FLIPPING);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
470
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27306
diff changeset
471 #ifdef CONFIG_GUI
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
472 if (use_gui) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
473 // GUI creates and manages window for us
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
474 guiGetEvent(guiSetShVideo, 0);
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18896
diff changeset
475 #ifndef GL_WIN32
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
476 goto glconfig;
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18896
diff changeset
477 #endif
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
478 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
479 #endif
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
480 #ifdef GL_WIN32
18079
f57317460375 fixes and cleanup for windows fullscreen switching (restore old position,
reimar
parents: 17956
diff changeset
481 if (!vo_w32_config(d_width, d_height, flags))
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
482 return -1;
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
483 #else
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
484 {
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
485 XVisualInfo *vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
486 if (vinfo == NULL)
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
487 {
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
488 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n");
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
489 return -1;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
490 }
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
491
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
492 vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
493 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone),
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
494 "gl", title);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
495 }
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
496 #endif
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
497
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
498 glconfig:
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
499 if (vo_config_count)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
500 uninitGl();
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
501 setGlWindow(&gl_vinfo, &gl_context, vo_window);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
502 initGl(vo_dwidth, vo_dheight);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
503
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
504 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
505 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
507 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
508 {
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
509 int e=vo_check_events();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
510 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight);
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
511 if(e&VO_EVENT_EXPOSE && int_pause) redraw();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
512 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
513
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
514 /**
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
515 * Creates the textures and the display list needed for displaying
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
516 * an OSD part.
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
517 * Callback function for vo_draw_text().
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
518 */
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
519 static void create_osd_texture(int x0, int y0, int w, int h,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
520 unsigned char *src, unsigned char *srca,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
521 int stride)
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
522 {
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
523 // initialize to 8 to avoid special-casing on alignment
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
524 int sx = 8, sy = 8;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
525 GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST;
17875
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
526
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
527 if (w <= 0 || h <= 0 || stride < w) {
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
528 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
529 return;
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
530 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
531 texSize(w, h, &sx, &sy);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
532
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
533 if (osdtexCnt >= MAX_OSD_PARTS) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
534 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n");
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
535 return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
536 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
537
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
538 // create Textures for OSD part
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
539 glGenTextures(1, &osdtex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
540 BindTexture(gl_target, osdtex[osdtexCnt]);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
541 glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
542 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
543 0, 0, w, h, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
544
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
545 #ifndef FAST_OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
546 glGenTextures(1, &osdatex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
547 BindTexture(gl_target, osdatex[osdtexCnt]);
28002
bcb567424fbc 100l, OSD alpha textures were cleared to the wrong value.
reimar
parents: 27987
diff changeset
548 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
549 {
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
550 int i;
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18872
diff changeset
551 char *tmp = malloc(stride * h);
16272
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
552 // convert alpha from weird MPlayer scale.
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
553 // in-place is not possible since it is reused for future OSDs
20420
0c63edaa7714 Fix single-black-pixel-in-upper-left-corner bug (how do people notice a single
reimar
parents: 20084
diff changeset
554 for (i = h * stride - 1; i >= 0; i--)
25951
9b51f2ba368b Support alpha for vo gl osdcolor
reimar
parents: 25912
diff changeset
555 tmp[i] = -srca[i];
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
556 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
557 0, 0, w, h, 0);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
558 free(tmp);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
559 }
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
560 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
561
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
562 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
563
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
564 // Create a list for rendering this OSD part
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
565 #ifndef FAST_OSD
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
566 osdaDispList[osdtexCnt] = glGenLists(1);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
567 glNewList(osdaDispList[osdtexCnt], GL_COMPILE);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
568 // render alpha
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
569 BindTexture(gl_target, osdatex[osdtexCnt]);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
570 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
571 glEndList();
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
572 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
573 osdDispList[osdtexCnt] = glGenLists(1);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
574 glNewList(osdDispList[osdtexCnt], GL_COMPILE);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
575 // render OSD
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
576 BindTexture(gl_target, osdtex[osdtexCnt]);
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
577 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
578 glEndList();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
579
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
580 osdtexCnt++;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
581 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
582
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
583 static void do_render_osd(void);
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
584
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
585 static void draw_osd(void)
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
586 {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
587 if (!use_osd) return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
588 if (vo_osd_changed(0)) {
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
589 int osd_h, osd_w;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
590 clearOSD();
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
591 osd_w = scaled_osd ? image_width : vo_dwidth;
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
592 osd_h = scaled_osd ? image_height : vo_dheight;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
593 vo_draw_text(osd_w, osd_h, create_osd_texture);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
594 }
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
595 if (vo_doublebuffering) do_render_osd();
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
596 }
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
597
26840
ea6c5ea1aa64 Split flip_page function
reimar
parents: 26836
diff changeset
598 static void do_render(void) {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 // glEnable(GL_TEXTURE_2D);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600 // glBindTexture(GL_TEXTURE_2D, texture_id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
601
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602 glColor3f(1,1,1);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
603 if (image_format == IMGFMT_YV12)
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
604 glEnableYUVConversion(gl_target, yuvconvtype);
16584
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
605 glDrawTex(0, 0, image_width, image_height,
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
606 0, 0, image_width, image_height,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
607 texture_width, texture_height,
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
608 use_rectangle == 1, image_format == IMGFMT_YV12,
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
609 mpi_flipped ^ vo_flipped);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
610 if (image_format == IMGFMT_YV12)
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
611 glDisableYUVConversion(gl_target, yuvconvtype);
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
612 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
613
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
614 static void do_render_osd(void) {
19936
f810e12fce63 use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0
reimar
parents: 19935
diff changeset
615 if (osdtexCnt > 0 || eosdDispList) {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
616 // set special rendering parameters
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
617 if (!scaled_osd) {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
618 glMatrixMode(GL_PROJECTION);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
619 glPushMatrix();
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
620 glLoadIdentity();
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
621 glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
622 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
623 glEnable(GL_BLEND);
19936
f810e12fce63 use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0
reimar
parents: 19935
diff changeset
624 if (eosdDispList) {
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
625 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
626 glCallList(eosdDispList);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
627 }
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
628 if (osdtexCnt > 0) {
25951
9b51f2ba368b Support alpha for vo gl osdcolor
reimar
parents: 25912
diff changeset
629 glColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24));
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
630 // draw OSD
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
631 #ifndef FAST_OSD
25951
9b51f2ba368b Support alpha for vo gl osdcolor
reimar
parents: 25912
diff changeset
632 glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
633 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
634 #endif
25951
9b51f2ba368b Support alpha for vo gl osdcolor
reimar
parents: 25912
diff changeset
635 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
636 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
637 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
638 // set rendering parameters back to defaults
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
639 glDisable(GL_BLEND);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
640 if (!scaled_osd)
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
641 glPopMatrix();
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
642 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
643 }
26840
ea6c5ea1aa64 Split flip_page function
reimar
parents: 26836
diff changeset
644 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
645
26840
ea6c5ea1aa64 Split flip_page function
reimar
parents: 26836
diff changeset
646 static void flip_page(void) {
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
647 if (vo_doublebuffering) {
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
648 if (use_glFinish) glFinish();
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
649 swapGlBuffers();
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
650 if (vo_fs && use_aspect)
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
651 glClear(GL_COLOR_BUFFER_BIT);
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
652 } else {
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
653 do_render();
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
654 do_render_osd();
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
655 if (use_glFinish) glFinish();
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
656 else glFlush();
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
657 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
658 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
659
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
660 static void redraw(void) {
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
661 if (vo_doublebuffering) { do_render(); do_render_osd(); }
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
662 flip_page();
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
663 }
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
664
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
665 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
666 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
667 {
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
668 mpi_flipped = stride[0] < 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
669 glUploadTex(gl_target, gl_format, gl_type, src[0], stride[0],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
670 x, y, w, h, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
671 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
672 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
673 glUploadTex(gl_target, gl_format, gl_type, src[1], stride[1],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
674 x / 2, y / 2, w / 2, h / 2, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
675 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
676 glUploadTex(gl_target, gl_format, gl_type, src[2], stride[2],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
677 x / 2, y / 2, w / 2, h / 2, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
678 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
679 }
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
680 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
681 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
682
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
683 static uint32_t get_image(mp_image_t *mpi) {
28065
aec8703ff07f Avoid one more duplicated logic.
reimar
parents: 28064
diff changeset
684 int needed_size;
16233
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
685 if (!GenBuffers || !BindBuffer || !BufferData || !MapBuffer) {
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
686 if (!err_shown)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
687 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
688 "Expect a _major_ speed penalty\n");
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
689 err_shown = 1;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
690 return VO_FALSE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
691 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
692 if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE;
27169
78d837adc71e 100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents: 27168
diff changeset
693 if (ati_hack) {
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
694 mpi->width = texture_width;
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
695 mpi->height = texture_height;
27169
78d837adc71e 100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents: 27168
diff changeset
696 }
27183
46e043b71654 Move at-hack code a bit up for further changes
reimar
parents: 27169
diff changeset
697 if (!gl_buffer)
46e043b71654 Move at-hack code a bit up for further changes
reimar
parents: 27169
diff changeset
698 GenBuffers(1, &gl_buffer);
46e043b71654 Move at-hack code a bit up for further changes
reimar
parents: 27169
diff changeset
699 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
700 mpi->stride[0] = mpi->width * mpi->bpp / 8;
28065
aec8703ff07f Avoid one more duplicated logic.
reimar
parents: 28064
diff changeset
701 needed_size = mpi->stride[0] * mpi->height;
aec8703ff07f Avoid one more duplicated logic.
reimar
parents: 28064
diff changeset
702 if (needed_size > gl_buffersize) {
aec8703ff07f Avoid one more duplicated logic.
reimar
parents: 28064
diff changeset
703 gl_buffersize = needed_size;
28064
4d76c7e31760 Simplify, do not duplicate buffer size calculation
reimar
parents: 28060
diff changeset
704 BufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize,
16237
b951a75d4f83 Our buffer usage actually fits better to GL_DYNAMIC_DRAW than GL_STREAM_DRAW.
reimar
parents: 16236
diff changeset
705 NULL, GL_DYNAMIC_DRAW);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
706 }
23987
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
707 if (!gl_bufferptr)
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
708 gl_bufferptr = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
709 mpi->planes[0] = gl_bufferptr;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
710 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
711 if (!mpi->planes[0]) {
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
712 if (!err_shown)
25754
e614d49112b5 Small typo in message
reimar
parents: 25729
diff changeset
713 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n"
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
714 "Expect a _major_ speed penalty\n");
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
715 err_shown = 1;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
716 return VO_FALSE;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
717 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
718 if (mpi->imgfmt == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
719 // YV12
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
720 mpi->flags |= MP_IMGFLAG_COMMON_STRIDE | MP_IMGFLAG_COMMON_PLANE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
721 mpi->stride[0] = mpi->width;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
722 mpi->planes[1] = mpi->planes[0] + mpi->stride[0] * mpi->height;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
723 mpi->stride[1] = mpi->width >> 1;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
724 mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> 1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
725 mpi->stride[2] = mpi->width >> 1;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
726 if (ati_hack) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
727 mpi->flags &= ~MP_IMGFLAG_COMMON_PLANE;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
728 if (!gl_buffer_uv[0]) GenBuffers(2, gl_buffer_uv);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
729 if (mpi->stride[1] * mpi->height > gl_buffersize_uv) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
730 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
731 BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height,
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
732 NULL, GL_DYNAMIC_DRAW);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
733 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
734 BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height,
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
735 NULL, GL_DYNAMIC_DRAW);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
736 gl_buffersize_uv = mpi->stride[1] * mpi->height;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
737 }
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
738 if (!gl_bufferptr_uv[0]) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
739 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
740 gl_bufferptr_uv[0] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
741 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
742 gl_bufferptr_uv[1] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
743 }
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
744 mpi->planes[1] = gl_bufferptr_uv[0];
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
745 mpi->planes[2] = gl_bufferptr_uv[1];
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
746 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
747 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
748 mpi->flags |= MP_IMGFLAG_DIRECT;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
749 return VO_TRUE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
750 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
751
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
752 static uint32_t draw_image(mp_image_t *mpi) {
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
753 int slice = slice_height;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
754 int stride[3];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
755 unsigned char *planes[3];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
756 mp_image_t mpi2 = *mpi;
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
757 int w = mpi->w, h = mpi->h;
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
758 if (ati_hack) { w = texture_width; h = texture_height; }
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
759 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
760 goto skip_upload;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
761 mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
762 mpi2.width = mpi2.w; mpi2.height = mpi2.h;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
763 if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) {
27089
2a7fb43a9976 100l, bpp is bits per pixel, not bytes
reimar
parents: 26842
diff changeset
764 int bpp = mpi->imgfmt == IMGFMT_YV12 ? 8 : mpi->bpp;
2a7fb43a9976 100l, bpp is bits per pixel, not bytes
reimar
parents: 26842
diff changeset
765 memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp / 8, mpi->h, mpi2.stride[0], mpi->stride[0]);
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
766 if (mpi->imgfmt == IMGFMT_YV12) {
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
767 memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]);
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
768 memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]);
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
769 }
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
770 mpi = &mpi2;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
771 }
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
772 stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
773 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2];
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
774 mpi_flipped = stride[0] < 0;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
775 if (mpi->flags & MP_IMGFLAG_DIRECT) {
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
776 intptr_t base = (intptr_t)planes[0];
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
777 if (mpi_flipped)
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
778 base += (mpi->h - 1) * stride[0];
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
779 planes[0] -= base;
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
780 planes[1] -= base;
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
781 planes[2] -= base;
16233
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
782 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
783 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
23987
9ea121c8e2df Handle case where get_image is called twice without a draw_image in-between
reimar
parents: 23878
diff changeset
784 gl_bufferptr = NULL;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
785 slice = 0; // always "upload" full texture
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
786 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE))
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
787 planes[0] = planes[1] = planes[2] = NULL;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
788 }
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
789 glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0],
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
790 mpi->x, mpi->y, w, h, slice);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
791 if (mpi->imgfmt == IMGFMT_YV12) {
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
792 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
793 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
794 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
795 gl_bufferptr_uv[0] = NULL;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
796 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
797 ActiveTexture(GL_TEXTURE1);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
798 glUploadTex(gl_target, gl_format, gl_type, planes[1], stride[1],
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
799 mpi->x / 2, mpi->y / 2, w / 2, h / 2, slice);
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
800 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
801 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
802 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
803 gl_bufferptr_uv[1] = NULL;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
804 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
805 ActiveTexture(GL_TEXTURE2);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
806 glUploadTex(gl_target, gl_format, gl_type, planes[2], stride[2],
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
807 mpi->x / 2, mpi->y / 2, w / 2, h / 2, slice);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
808 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
809 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
810 if (mpi->flags & MP_IMGFLAG_DIRECT)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
811 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
812 skip_upload:
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
813 if (vo_doublebuffering) do_render();
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
814 return VO_TRUE;
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
815 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
816
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
817 static int
10138
5e286cc6ad21 Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents: 8654
diff changeset
818 draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
819 {
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
820 return VO_ERROR;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
821 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
822
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
823 static int
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
824 query_format(uint32_t format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
825 {
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
826 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW |
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
827 VFCAP_FLIP |
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
828 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
829 if (use_osd)
23135
960434b7d963 Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd
reimar
parents: 23134
diff changeset
830 caps |= VFCAP_OSD | VFCAP_EOSD | (scaled_osd ? 0 : VFCAP_EOSD_UNSCALED);
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
831 if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA)
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
832 return caps;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
833 if (use_yuv && format == IMGFMT_YV12)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
834 return caps;
19356
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
835 // HACK, otherwise we get only b&w with some filters (e.g. -vf eq)
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
836 // ideally MPlayer should be fixed instead not to use Y800 when it has the choice
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
837 if (!use_yuv && (format == IMGFMT_Y8 || format == IMGFMT_Y800))
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
838 return 0;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
839 if (!use_ycbcr && (format == IMGFMT_UYVY || format == IMGFMT_YUY2))
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
840 return 0;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
841 if (many_fmts &&
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
842 glFindFormat(format, NULL, NULL, NULL, NULL))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
843 return caps;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
844 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
845 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
846
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
847
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
848 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
849 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
850 {
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
851 if (!vo_config_count) return;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
852 uninitGl();
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
853 releaseGlContext(&gl_vinfo, &gl_context);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
854 if (custom_prog) free(custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
855 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
856 if (custom_tex) free(custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
857 custom_tex = NULL;
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
858 vo_uninit();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
859 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
860
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
861 static opt_t subopts[] = {
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
862 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
863 {"osd", OPT_ARG_BOOL, &use_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
864 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
865 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL},
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
866 {"ycbcr", OPT_ARG_BOOL, &use_ycbcr, NULL},
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
867 {"slice-height", OPT_ARG_INT, &slice_height, (opt_test_f)int_non_neg},
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
868 {"rectangle", OPT_ARG_INT, &use_rectangle,(opt_test_f)int_non_neg},
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
869 {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg},
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
870 {"lscale", OPT_ARG_INT, &lscale, (opt_test_f)int_non_neg},
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
871 {"cscale", OPT_ARG_INT, &cscale, (opt_test_f)int_non_neg},
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
872 {"filter-strength", OPT_ARG_FLOAT, &filter_strength, NULL},
26677
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
873 {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL},
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
874 {"force-pbo", OPT_ARG_BOOL, &force_pbo, NULL},
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
875 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL},
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
876 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL},
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
877 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL},
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
878 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL},
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
879 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL},
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
880 {"customtrect", OPT_ARG_BOOL, &custom_trect, NULL},
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
881 {"osdcolor", OPT_ARG_INT, &osd_color, NULL},
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
882 {NULL}
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
883 };
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
884
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
885 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
886 {
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
887 // set defaults
16012
f9e53883dfd2 Enable manyfmts by default for vo_gl
reimar
parents: 15748
diff changeset
888 many_fmts = 1;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
889 use_osd = 1;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
890 scaled_osd = 0;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
891 use_aspect = 1;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
892 use_ycbcr = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
893 use_yuv = 0;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
894 lscale = 0;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
895 cscale = 0;
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
896 filter_strength = 0.5;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
897 use_rectangle = 0;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
898 use_glFinish = 0;
26677
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
899 ati_hack = 0;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
900 force_pbo = 0;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
901 swap_interval = 1;
23878
e64c59f73527 Set -vo gl slice-height default to 0, the current default of 4 seems
reimar
parents: 23655
diff changeset
902 slice_height = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
903 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
904 custom_tex = NULL;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
905 custom_tlin = 1;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
906 custom_trect = 0;
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
907 osd_color = 0xffffff;
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
908 if (subopt_parse(arg, subopts) != 0) {
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
909 mp_msg(MSGT_VO, MSGL_FATAL,
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
910 "\n-vo gl command line help:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
911 "Example: mplayer -vo gl:slice-height=4\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
912 "\nOptions:\n"
22087
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
913 " nomanyfmts\n"
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
914 " Disable extended color formats for OpenGL 1.2 and later\n"
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
915 " slice-height=<0-...>\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
916 " Slice size for texture transfer, 0 for whole image\n"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
917 " noosd\n"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
918 " Do not use OpenGL OSD code\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
919 " scaled-osd\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
920 " Render OSD at movie resolution and scale it\n"
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
921 " noaspect\n"
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
922 " Do not do aspect scaling\n"
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
923 " rectangle=<0,1,2>\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
924 " 0: use power-of-two textures\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
925 " 1: use texture_rectangle\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
926 " 2: use texture_non_power_of_two\n"
26677
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
927 " ati-hack\n"
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
928 " Workaround ATI bug with PBOs\n"
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
929 " force-pbo\n"
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
930 " Force use of PBO even if this involves an extra memcpy\n"
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
931 " glfinish\n"
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
932 " Call glFinish() before swapping buffers\n"
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
933 " swapinterval=<n>\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
934 " Interval in displayed frames between to buffer swaps.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
935 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
936 " Requires GLX_SGI_swap_control support to work.\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
937 " yuv=<n>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
938 " 0: use software YUV to RGB conversion.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
939 " 1: use register combiners (nVidia only, for older cards).\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
940 " 2: use fragment program.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
941 " 3: use fragment program with gamma correction.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
942 " 4: use fragment program with gamma correction via lookup.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
943 " 5: use ATI-specific method (for older cards).\n"
22087
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
944 " 6: use lookup via 3D texture.\n"
18695
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
945 " lscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
946 " 0: use standard bilinear scaling for luma.\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
947 " 1: use improved bicubic scaling for luma.\n"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22232
diff changeset
948 " 2: use cubic in X, linear in Y direction scaling for luma.\n"
25728
df6e9b54ecaa Document vo gl lscale=3
reimar
parents: 25485
diff changeset
949 " 3: as 1 but without using a lookup texture.\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
950 " 4: experimental unsharp masking (sharpening).\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
951 " 5: experimental unsharp masking (sharpening) with larger radius.\n"
18695
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
952 " cscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
953 " as lscale but for chroma (2x slower with little visible effect).\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
954 " filter-strength=<value>\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
955 " set the effect strength for some lscale/cscale filters\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
956 " customprog=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
957 " use a custom YUV conversion program\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
958 " customtex=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
959 " use a custom YUV conversion lookup texture\n"
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
960 " nocustomtlin\n"
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
961 " use GL_NEAREST scaling for customtex texture\n"
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
962 " customtrect\n"
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
963 " use texture_rectangle for customtex texture\n"
25952
bb89f92affff Slightly document alpha for OSD color
reimar
parents: 25951
diff changeset
964 " osdcolor=<0xAARRGGBB>\n"
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
965 " use the given color for the OSD\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
966 " ycbcr\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
967 " also try to use the GL_MESA_ycbcr_texture extension\n"
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
968 "\n" );
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
969 return -1;
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
970 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
971 if (use_rectangle == 1)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
972 gl_target = GL_TEXTURE_RECTANGLE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
973 else
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
974 gl_target = GL_TEXTURE_2D;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
975 yuvconvtype = use_yuv | lscale << YUV_LUM_SCALER_SHIFT | cscale << YUV_CHROM_SCALER_SHIFT;
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
976 if (many_fmts)
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
977 mp_msg(MSGT_VO, MSGL_INFO, "[gl] using extended formats. "
16880
1267964a4dfa 10l typo, nomanyfmts should be used against playback problems.
reimar
parents: 16879
diff changeset
978 "Use -vo gl:nomanyfmts if playback fails.\n");
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
979 mp_msg(MSGT_VO, MSGL_V, "[gl] Using %d as slice height "
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
980 "(0 means image height).\n", slice_height);
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
981 if (!vo_init()) return -1; // Can't open X11
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
982
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
983 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
984 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
985
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
986 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
987 #define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI)))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
988 #define MASK_GAMMA_SUPPORT (MASK_NOT_COMBINERS & ~(1 << YUV_CONVERSION_FRAGMENT))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
989
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
990 static const struct {
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
991 const char *name;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
992 int *value;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
993 int supportmask;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
994 } eq_map[] = {
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
995 {"brightness", &eq_bri, MASK_NOT_COMBINERS},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
996 {"contrast", &eq_cont, MASK_NOT_COMBINERS},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
997 {"saturation", &eq_sat, MASK_ALL_YUV },
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
998 {"hue", &eq_hue, MASK_ALL_YUV },
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
999 {"gamma", &eq_rgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1000 {"red_gamma", &eq_rgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1001 {"green_gamma", &eq_ggamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1002 {"blue_gamma", &eq_bgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1003 {NULL, NULL, 0 }
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1004 };
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1005
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
1006 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1007 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1008 switch (request) {
26823
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1009 case VOCTRL_PAUSE:
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1010 case VOCTRL_RESUME:
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1011 int_pause = (request == VOCTRL_PAUSE);
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1012 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1013 case VOCTRL_QUERY_FORMAT:
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1014 return query_format(*(uint32_t*)data);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1015 case VOCTRL_GET_IMAGE:
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1016 return get_image(data);
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
1017 case VOCTRL_DRAW_IMAGE:
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
1018 return draw_image(data);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1019 case VOCTRL_DRAW_EOSD:
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
1020 if (!data)
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
1021 return VO_FALSE;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1022 genEOSD(data);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1023 return VO_TRUE;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1024 case VOCTRL_GET_EOSD_RES:
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1025 {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1026 mp_eosd_res_t *r = data;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1027 r->mt = r->mb = r->ml = r->mr = 0;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1028 if (scaled_osd) {r->w = image_width; r->h = image_height;}
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1029 else if (vo_fs) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1030 r->w = vo_screenwidth; r->h = vo_screenheight;
24787
02535b3216c5 Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents: 23987
diff changeset
1031 r->ml = r->mr = ass_border_x;
02535b3216c5 Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents: 23987
diff changeset
1032 r->mt = r->mb = ass_border_y;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1033 } else {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1034 r->w = vo_dwidth; r->h = vo_dheight;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1035 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1036 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1037 return VO_TRUE;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
1038 case VOCTRL_GUISUPPORT:
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
1039 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
1040 case VOCTRL_ONTOP:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
1041 vo_ontop();
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
1042 return VO_TRUE;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1043 case VOCTRL_FULLSCREEN:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
1044 vo_fullscreen();
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
1045 resize(vo_dwidth, vo_dheight);
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1046 return VO_TRUE;
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
1047 case VOCTRL_BORDER:
27306
7a650839fc10 Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents: 27184
diff changeset
1048 vo_border();
25912
92db8b8c20d4 Redraw display on toggling border
reimar
parents: 25911
diff changeset
1049 resize(vo_dwidth, vo_dheight);
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
1050 return VO_TRUE;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1051 case VOCTRL_GET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1052 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1053 return VO_TRUE;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1054 case VOCTRL_SET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1055 if (!use_aspect) return VO_NOTIMPL;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1056 resize(vo_dwidth, vo_dheight);
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1057 return VO_TRUE;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1058 case VOCTRL_GET_EQUALIZER:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1059 if (image_format == IMGFMT_YV12) {
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1060 int i;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1061 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1062 int *value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1063 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1064 value = va_arg(va, int *);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1065 va_end(va);
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1066 for (i = 0; eq_map[i].name; i++)
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1067 if (strcmp(data, eq_map[i].name) == 0) break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1068 if (!(eq_map[i].supportmask & (1 << use_yuv)))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1069 break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1070 *value = *eq_map[i].value;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1071 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1072 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1073 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1074 case VOCTRL_SET_EQUALIZER:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1075 if (image_format == IMGFMT_YV12) {
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1076 int i;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1077 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1078 int value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1079 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1080 value = va_arg(va, int);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1081 va_end(va);
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1082 for (i = 0; eq_map[i].name; i++)
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1083 if (strcmp(data, eq_map[i].name) == 0) break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1084 if (!(eq_map[i].supportmask & (1 << use_yuv)))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1085 break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1086 *eq_map[i].value = value;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1087 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1088 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1089 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1090 break;
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22149
diff changeset
1091 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22149
diff changeset
1092 update_xinerama_info();
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22149
diff changeset
1093 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1094 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1095 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1096 }