Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 28282:31849f6ac0c7
Sync with latest FFmpeg changes: #define disabled preprocessor directives
used by FFmpeg to 0 instead of leaving them undefined.
author | diego |
---|---|
date | Thu, 15 Jan 2009 15:56:24 +0000 |
parents | aeefca2deed3 |
children | 395034c15a4b |
rev | line source |
---|---|
1 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
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 | 5 |
16221 | 6 #include "config.h" |
11988 | 7 #include "mp_msg.h" |
14286 | 8 #include "subopt-helper.h" |
1 | 9 #include "video_out.h" |
10 #include "video_out_internal.h" | |
13585 | 11 #include "font_load.h" |
12 #include "sub.h" | |
1 | 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 | 15 #include "aspect.h" |
27343 | 16 #ifdef CONFIG_GUI |
23077 | 17 #include "gui/interface.h" |
13843 | 18 #endif |
26681 | 19 #include "fastmemcpy.h" |
19578 | 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 | 22 |
25216 | 23 static const vo_info_t info = |
1 | 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 | 29 }; |
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 | 36 #define update_xinerama_info w32_update_xinerama_info |
37 #define vo_init vo_w32_init | |
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 | 40 static XVisualInfo *gl_vinfo = NULL; |
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 | 43 GLX_RED_SIZE,1, |
44 GLX_GREEN_SIZE,1, | |
45 GLX_BLUE_SIZE,1, | |
46 GLX_DOUBLEBUFFER, | |
47 None }; | |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
48 #endif |
1 | 49 |
13599 | 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 | 52 //! How many parts the OSD may consist of at most |
13585 | 53 #define MAX_OSD_PARTS 20 |
14269 | 54 //! Textures for OSD |
13599 | 55 static GLuint osdtex[MAX_OSD_PARTS]; |
13585 | 56 #ifndef FAST_OSD |
14269 | 57 //! Alpha textures for OSD |
13599 | 58 static GLuint osdatex[MAX_OSD_PARTS]; |
13585 | 59 #endif |
19578 | 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 | 62 //! Display lists that draw the OSD parts |
13599 | 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 | 67 static GLuint eosdDispList; |
14269 | 68 //! How many parts the OSD currently consists of |
16433 | 69 static int osdtexCnt; |
19578 | 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 | 72 |
13601 | 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 | 80 static int use_rectangle; |
81 static int err_shown; | |
1 | 82 static uint32_t image_width; |
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 | 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 | 87 static int force_pbo; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
88 static int mesa_buffer; |
16235 | 89 static int use_glFinish; |
16268 | 90 static int swap_interval; |
16099 | 91 static GLenum gl_target; |
16303
a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents:
16282
diff
changeset
|
92 static GLint gl_texfmt; |
12159 | 93 static GLenum gl_format; |
94 static GLenum gl_type; | |
16434 | 95 static GLuint gl_buffer; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
96 static GLuint gl_buffer_uv[2]; |
16099 | 97 static int gl_buffersize; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
98 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
|
99 static void *gl_bufferptr; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
100 static void *gl_bufferptr_uv[2]; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
101 static int mesa_buffersize; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
102 static void *mesa_bufferptr; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
103 static GLuint fragprog; |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
104 static GLuint default_texs[22]; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
105 static char *custom_prog; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
106 static char *custom_tex; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
107 static int custom_tlin; |
18963 | 108 static int custom_trect; |
1 | 109 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
110 static int int_pause; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
111 static int eq_bri = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
112 static int eq_cont = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
113 static int eq_sat = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
114 static int eq_hue = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
115 static int eq_rgamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
116 static int eq_ggamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
117 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
|
118 |
16879
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
119 static int texture_width; |
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
120 static int texture_height; |
17220 | 121 static int mpi_flipped; |
18996 | 122 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
|
123 static int ass_border_x, ass_border_y; |
1 | 124 |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
125 static unsigned int slice_height = 1; |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
126 |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
127 static void redraw(void); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
128 |
612 | 129 static void resize(int x,int y){ |
11988 | 130 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y); |
15748 | 131 if (WinID >= 0) { |
132 int top = 0, left = 0, w = x, h = y; | |
133 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight); | |
134 glViewport(top, left, w, h); | |
135 } else | |
1 | 136 glViewport( 0, 0, x, y ); |
137 | |
138 glMatrixMode(GL_PROJECTION); | |
139 glLoadIdentity(); | |
13601 | 140 if (vo_fs && use_aspect) { |
141 int new_w, new_h; | |
142 GLdouble scale_x, scale_y; | |
143 aspect(&new_w, &new_h, A_ZOOM); | |
144 panscan_calc(); | |
145 new_w += vo_panscan_x; | |
146 new_h += vo_panscan_y; | |
28035 | 147 scale_x = (GLdouble)new_w / (GLdouble)x; |
148 scale_y = (GLdouble)new_h / (GLdouble)y; | |
13601 | 149 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
|
150 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
|
151 ass_border_y = (vo_screenheight - new_h) / 2; |
13601 | 152 } |
1 | 153 glOrtho(0, image_width, image_height, 0, -1,1); |
154 | |
155 glMatrixMode(GL_MODELVIEW); | |
156 glLoadIdentity(); | |
13585 | 157 |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
158 if (!scaled_osd) { |
27393 | 159 #ifdef CONFIG_FREETYPE |
15086
c9eee448e5b2
revert the previous commit, gl needs to reload the font immediately
henry
parents:
15080
diff
changeset
|
160 // adjust font size to display size |
c9eee448e5b2
revert the previous commit, gl needs to reload the font immediately
henry
parents:
15080
diff
changeset
|
161 force_load_font = 1; |
c9eee448e5b2
revert the previous commit, gl needs to reload the font immediately
henry
parents:
15080
diff
changeset
|
162 #endif |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
163 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
|
164 } |
25911 | 165 glClear(GL_COLOR_BUFFER_BIT); |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
166 redraw(); |
1 | 167 } |
168 | |
16099 | 169 static void texSize(int w, int h, int *texw, int *texh) { |
170 if (use_rectangle) { | |
171 *texw = w; *texh = h; | |
172 } else { | |
173 *texw = 32; | |
174 while (*texw < w) | |
175 *texw *= 2; | |
176 *texh = 32; | |
177 while (*texh < h) | |
178 *texh *= 2; | |
179 } | |
28073 | 180 if (mesa_buffer) *texw = (*texw + 63) & ~63; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
181 else if (ati_hack) *texw = (*texw + 511) & ~511; |
16099 | 182 } |
183 | |
16595
b3a9fb41f475
fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents:
16593
diff
changeset
|
184 //! maximum size of custom fragment program |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
185 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024) |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
186 static void update_yuvconv(void) { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
187 float bri = eq_bri / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
188 float cont = (eq_cont + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
189 float hue = eq_hue / 100.0 * 3.1415927; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
190 float sat = (eq_sat + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
191 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
|
192 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
|
193 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
|
194 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
|
195 bri, cont, hue, sat, rgamma, ggamma, bgamma, |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
196 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
|
197 glSetupYUVConversion(¶ms); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
198 if (custom_prog) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
199 FILE *f = fopen(custom_prog, "r"); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
200 if (!f) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
201 mp_msg(MSGT_VO, MSGL_WARN, |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
202 "[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
|
203 else { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
204 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
|
205 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
206 fclose(f); |
18653
5af43a16abc3
loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents:
18619
diff
changeset
|
207 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
208 free(prog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
209 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
210 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0, |
18960 | 211 1.0 / texture_width, 1.0 / texture_height, |
212 texture_width, texture_height); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
213 } |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
214 if (custom_tex) { |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
215 FILE *f = fopen(custom_tex, "r"); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
216 if (!f) |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
217 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
218 "[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
|
219 else { |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
220 int width, height, maxval; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
221 ActiveTexture(GL_TEXTURE3); |
18963 | 222 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
|
223 custom_tlin?GL_LINEAR:GL_NEAREST, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
224 f, &width, &height, &maxval)) |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
225 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1, |
18960 | 226 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
|
227 else |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
228 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
229 "[gl] Error parsing customtex %s\n", custom_tex); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
230 fclose(f); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
231 ActiveTexture(GL_TEXTURE0); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
232 } |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
233 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
234 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
235 |
16436 | 236 /** |
237 * \brief remove all OSD textures and display-lists, thus clearing it. | |
238 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
239 static void clearOSD(void) { |
16433 | 240 int i; |
17871
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
241 if (!osdtexCnt) |
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
242 return; |
16433 | 243 glDeleteTextures(osdtexCnt, osdtex); |
244 #ifndef FAST_OSD | |
245 glDeleteTextures(osdtexCnt, osdatex); | |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
246 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
|
247 glDeleteLists(osdaDispList[i], 1); |
16433 | 248 #endif |
249 for (i = 0; i < osdtexCnt; i++) | |
250 glDeleteLists(osdDispList[i], 1); | |
251 osdtexCnt = 0; | |
252 } | |
253 | |
254 /** | |
19578 | 255 * \brief remove textures, display list and free memory used by EOSD |
256 */ | |
257 static void clearEOSD(void) { | |
19934 | 258 if (eosdDispList) |
259 glDeleteLists(eosdDispList, 1); | |
260 eosdDispList = 0; | |
261 if (eosdtexCnt) | |
262 glDeleteTextures(eosdtexCnt, eosdtex); | |
263 eosdtexCnt = 0; | |
19578 | 264 free(eosdtex); |
265 eosdtex = NULL; | |
266 } | |
267 | |
268 /** | |
269 * \brief construct display list from ass image list | |
270 * \param img image list to create OSD from. | |
271 * A value of NULL has the same effect as clearEOSD() | |
272 */ | |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
273 static void genEOSD(mp_eosd_images_t *imgs) { |
19578 | 274 int sx, sy; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
275 int tinytexcur = 0; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
276 int smalltexcur = 0; |
19578 | 277 GLuint *curtex; |
28035 | 278 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
|
279 ass_image_t *img = imgs->imgs; |
19578 | 280 ass_image_t *i; |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
281 |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
282 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
|
283 return; |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
284 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
|
285 goto skip_upload; |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
286 |
19578 | 287 clearEOSD(); |
19935
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
288 if (!img) |
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
289 return; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
290 if (!largeeosdtex[0]) { |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
291 glGenTextures(2, largeeosdtex); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
292 BindTexture(gl_target, largeeosdtex[0]); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
293 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
|
294 BindTexture(gl_target, largeeosdtex[1]); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
295 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
|
296 } |
19578 | 297 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
|
298 { |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
299 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
|
300 continue; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
301 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
|
302 tinytexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
303 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
|
304 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
305 else |
19939 | 306 eosdtexCnt++; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
307 } |
20084 | 308 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n", |
309 tinytexcur, smalltexcur, eosdtexCnt); | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
310 if (eosdtexCnt) { |
19939 | 311 eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); |
312 glGenTextures(eosdtexCnt, eosdtex); | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
313 } |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
314 tinytexcur = smalltexcur = 0; |
19937
34796c9b8667
Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents:
19936
diff
changeset
|
315 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
|
316 int x = 0, y = 0; |
19578 | 317 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) { |
318 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n"); | |
319 continue; | |
320 } | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
321 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
|
322 x = (tinytexcur & 31) << 4; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
323 y = (tinytexcur >> 5) << 4; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
324 BindTexture(gl_target, largeeosdtex[0]); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
325 tinytexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
326 } 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
|
327 x = (smalltexcur & 15) << 5; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
328 y = (smalltexcur >> 4) << 5; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
329 BindTexture(gl_target, largeeosdtex[1]); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
330 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
331 } else { |
19939 | 332 texSize(i->w, i->h, &sx, &sy); |
333 BindTexture(gl_target, *curtex++); | |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
334 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
|
335 } |
19578 | 336 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
|
337 x, y, i->w, i->h, 0); |
19578 | 338 } |
339 eosdDispList = glGenLists(1); | |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
340 skip_upload: |
19578 | 341 glNewList(eosdDispList, GL_COMPILE); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
342 tinytexcur = smalltexcur = 0; |
19937
34796c9b8667
Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents:
19936
diff
changeset
|
343 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
|
344 int x = 0, y = 0; |
19578 | 345 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) |
346 continue; | |
347 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
|
348 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
|
349 x = (tinytexcur & 31) << 4; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
350 y = (tinytexcur >> 5) << 4; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
351 sx = sy = 512; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
352 BindTexture(gl_target, largeeosdtex[0]); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
353 tinytexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
354 } 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
|
355 x = (smalltexcur & 15) << 5; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
356 y = (smalltexcur >> 4) << 5; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
357 sx = sy = 512; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
358 BindTexture(gl_target, largeeosdtex[1]); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
359 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
360 } else { |
19939 | 361 texSize(i->w, i->h, &sx, &sy); |
362 BindTexture(gl_target, *curtex++); | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
363 } |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
364 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 | 365 } |
366 glEndList(); | |
367 BindTexture(gl_target, 0); | |
368 } | |
369 | |
370 /** | |
16433 | 371 * \brief uninitialize OpenGL context, freeing textures, buffers etc. |
372 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
373 static void uninitGl(void) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
374 int i = 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
375 if (DeletePrograms && fragprog) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
376 DeletePrograms(1, &fragprog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
377 fragprog = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
378 while (default_texs[i] != 0) |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
379 i++; |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
380 if (i) |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
381 glDeleteTextures(i, default_texs); |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
382 default_texs[0] = 0; |
16433 | 383 clearOSD(); |
19578 | 384 clearEOSD(); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
385 if (largeeosdtex[0]) |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
386 glDeleteTextures(2, largeeosdtex); |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
387 largeeosdtex[0] = 0; |
16433 | 388 if (DeleteBuffers && gl_buffer) |
389 DeleteBuffers(1, &gl_buffer); | |
390 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
|
391 gl_bufferptr = NULL; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
392 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
|
393 DeleteBuffers(2, gl_buffer_uv); |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
394 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
|
395 gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0; |
28069
74b62cf052af
10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.
reimar
parents:
28068
diff
changeset
|
396 #ifndef GL_WIN32 |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
397 if (mesa_bufferptr) |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
398 FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
28069
74b62cf052af
10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.
reimar
parents:
28068
diff
changeset
|
399 #endif |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
400 mesa_bufferptr = NULL; |
16433 | 401 err_shown = 0; |
402 } | |
403 | |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
404 static void autodetectGlExtensions(void) { |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
405 const char *extensions = glGetString(GL_EXTENSIONS); |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
406 const char *vendor = glGetString(GL_VENDOR); |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
407 int is_ati = strstr(vendor, "ATI") != NULL; |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
408 if (ati_hack == -1) ati_hack = is_ati; |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
409 if (force_pbo == -1) force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; |
28152
712225607a2c
Do not default to rectangle=2, it is at least for ATI HD4850 cards with 8.12 drivers 20% slower at HD resolutions
reimar
parents:
28091
diff
changeset
|
410 if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0; |
28153
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
411 if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2)) |
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
412 mp_msg(MSGT_VO, MSGL_WARN, "Selected scaling mode may be broken on ATI cards.\n" |
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
413 "Tell _them_ to fix GL_REPEAT if you have issues.\n"); |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
414 } |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
415 |
13843 | 416 /** |
417 * \brief Initialize a (new or reused) OpenGL context. | |
16433 | 418 * set global gl-related variables to their default values |
13843 | 419 */ |
420 static int initGl(uint32_t d_width, uint32_t d_height) { | |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
421 autodetectGlExtensions(); |
16099 | 422 texSize(image_width, image_height, &texture_width, &texture_height); |
13843 | 423 |
424 glDisable(GL_BLEND); | |
425 glDisable(GL_DEPTH_TEST); | |
426 glDepthMask(GL_FALSE); | |
427 glDisable(GL_CULL_FACE); | |
16099 | 428 glEnable(gl_target); |
16458 | 429 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
|
430 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); |
13843 | 431 |
432 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n", | |
433 texture_width, texture_height); | |
434 | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
435 if (image_format == IMGFMT_YV12) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
436 int i; |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
437 glGenTextures(21, default_texs); |
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
438 default_texs[21] = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
439 for (i = 0; i < 7; i++) { |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
440 ActiveTexture(GL_TEXTURE1 + i); |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
441 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
|
442 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
|
443 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
|
444 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
445 ActiveTexture(GL_TEXTURE1); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
446 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
|
447 texture_width / 2, texture_height / 2, 128); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
448 ActiveTexture(GL_TEXTURE2); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
449 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
|
450 texture_width / 2, texture_height / 2, 128); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
451 switch (use_yuv) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
452 case YUV_CONVERSION_FRAGMENT_LOOKUP: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
453 case YUV_CONVERSION_FRAGMENT_POW: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
454 case YUV_CONVERSION_FRAGMENT: |
18579
fc3f25278021
Move/add checks to avoid crashes and make error messages less confusing
reimar
parents:
18116
diff
changeset
|
455 if (!GenPrograms || !BindProgram) { |
fc3f25278021
Move/add checks to avoid crashes and make error messages less confusing
reimar
parents:
18116
diff
changeset
|
456 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
|
457 break; |
fc3f25278021
Move/add checks to avoid crashes and make error messages less confusing
reimar
parents:
18116
diff
changeset
|
458 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
459 GenPrograms(1, &fragprog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
460 BindProgram(GL_FRAGMENT_PROGRAM, fragprog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
461 break; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
462 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
463 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
464 BindTexture(gl_target, 0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
465 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
466 } |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
467 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR, |
16117 | 468 texture_width, texture_height, 0); |
13843 | 469 |
470 resize(d_width, d_height); | |
471 | |
472 glClearColor( 0.0f,0.0f,0.0f,0.0f ); | |
473 glClear( GL_COLOR_BUFFER_BIT ); | |
16271 | 474 if (SwapInterval && swap_interval >= 0) |
16268 | 475 SwapInterval(swap_interval); |
13920 | 476 return 1; |
13843 | 477 } |
478 | |
1 | 479 /* connect to server, create and map window, |
480 * allocate colors and (shared) memory | |
481 */ | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
482 static int |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
483 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 484 { |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
485 image_height = height; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
486 image_width = width; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
487 image_format = format; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
488 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
|
489 |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
490 int_pause = 0; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
491 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
|
492 |
27343 | 493 #ifdef CONFIG_GUI |
13843 | 494 if (use_gui) { |
495 // GUI creates and manages window for us | |
496 guiGetEvent(guiSetShVideo, 0); | |
18949 | 497 #ifndef GL_WIN32 |
15748 | 498 goto glconfig; |
18949 | 499 #endif |
13843 | 500 } |
501 #endif | |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
502 #ifdef GL_WIN32 |
18079
f57317460375
fixes and cleanup for windows fullscreen switching (restore old position,
reimar
parents:
17956
diff
changeset
|
503 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
|
504 return -1; |
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
505 #else |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23505
diff
changeset
|
506 { |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23505
diff
changeset
|
507 XVisualInfo *vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
508 if (vinfo == NULL) |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
509 { |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
510 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
|
511 return -1; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
512 } |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
513 |
23655
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23505
diff
changeset
|
514 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
|
515 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone), |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23505
diff
changeset
|
516 "gl", title); |
13843 | 517 } |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
518 #endif |
15748 | 519 |
520 glconfig: | |
16433 | 521 if (vo_config_count) |
522 uninitGl(); | |
13843 | 523 setGlWindow(&gl_vinfo, &gl_context, vo_window); |
524 initGl(vo_dwidth, vo_dheight); | |
11542 | 525 |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
526 return 0; |
1 | 527 } |
528 | |
31 | 529 static void check_events(void) |
1 | 530 { |
17116 | 531 int e=vo_check_events(); |
31 | 532 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
|
533 if(e&VO_EVENT_EXPOSE && int_pause) redraw(); |
31 | 534 } |
1 | 535 |
13585 | 536 /** |
537 * Creates the textures and the display list needed for displaying | |
538 * an OSD part. | |
539 * Callback function for vo_draw_text(). | |
540 */ | |
541 static void create_osd_texture(int x0, int y0, int w, int h, | |
542 unsigned char *src, unsigned char *srca, | |
543 int stride) | |
544 { | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
545 // 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
|
546 int sx = 8, sy = 8; |
28035 | 547 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
|
548 |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
549 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
|
550 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
|
551 return; |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
552 } |
16099 | 553 texSize(w, h, &sx, &sy); |
13585 | 554 |
555 if (osdtexCnt >= MAX_OSD_PARTS) { | |
556 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n"); | |
557 return; | |
558 } | |
559 | |
560 // create Textures for OSD part | |
561 glGenTextures(1, &osdtex[osdtexCnt]); | |
16099 | 562 BindTexture(gl_target, osdtex[osdtexCnt]); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
563 glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 564 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride, |
565 0, 0, w, h, 0); | |
13585 | 566 |
567 #ifndef FAST_OSD | |
568 glGenTextures(1, &osdatex[osdtexCnt]); | |
16099 | 569 BindTexture(gl_target, osdatex[osdtexCnt]); |
28002
bcb567424fbc
100l, OSD alpha textures were cleared to the wrong value.
reimar
parents:
27987
diff
changeset
|
570 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 571 { |
16221 | 572 int i; |
18878 | 573 char *tmp = malloc(stride * h); |
16272 | 574 // convert alpha from weird MPlayer scale. |
575 // 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
|
576 for (i = h * stride - 1; i >= 0; i--) |
25951 | 577 tmp[i] = -srca[i]; |
16117 | 578 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride, |
579 0, 0, w, h, 0); | |
580 free(tmp); | |
581 } | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
582 #endif |
13585 | 583 |
16099 | 584 BindTexture(gl_target, 0); |
13585 | 585 |
586 // 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
|
587 #ifndef FAST_OSD |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
588 osdaDispList[osdtexCnt] = glGenLists(1); |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
589 glNewList(osdaDispList[osdtexCnt], GL_COMPILE); |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
590 // render alpha |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
591 BindTexture(gl_target, osdatex[osdtexCnt]); |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
592 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
|
593 glEndList(); |
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
594 #endif |
13585 | 595 osdDispList[osdtexCnt] = glGenLists(1); |
596 glNewList(osdDispList[osdtexCnt], GL_COMPILE); | |
597 // render OSD | |
16099 | 598 BindTexture(gl_target, osdtex[osdtexCnt]); |
17220 | 599 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0); |
13585 | 600 glEndList(); |
601 | |
602 osdtexCnt++; | |
603 } | |
604 | |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
605 static void do_render_osd(void); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
606 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
607 static void draw_osd(void) |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
608 { |
13585 | 609 if (!use_osd) return; |
610 if (vo_osd_changed(0)) { | |
16221 | 611 int osd_h, osd_w; |
16433 | 612 clearOSD(); |
28035 | 613 osd_w = scaled_osd ? image_width : vo_dwidth; |
614 osd_h = scaled_osd ? image_height : vo_dheight; | |
28255
aeefca2deed3
Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigation
reimar
parents:
28164
diff
changeset
|
615 vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, |
aeefca2deed3
Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigation
reimar
parents:
28164
diff
changeset
|
616 image_width, image_height, create_osd_texture); |
13585 | 617 } |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
618 if (vo_doublebuffering) do_render_osd(); |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
619 } |
31 | 620 |
26840 | 621 static void do_render(void) { |
1 | 622 // glEnable(GL_TEXTURE_2D); |
623 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
624 | |
625 glColor3f(1,1,1); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
626 if (image_format == IMGFMT_YV12) |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
627 glEnableYUVConversion(gl_target, yuvconvtype); |
16584 | 628 glDrawTex(0, 0, image_width, image_height, |
629 0, 0, image_width, image_height, | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
630 texture_width, texture_height, |
18996 | 631 use_rectangle == 1, image_format == IMGFMT_YV12, |
632 mpi_flipped ^ vo_flipped); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
633 if (image_format == IMGFMT_YV12) |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
634 glDisableYUVConversion(gl_target, yuvconvtype); |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
635 } |
1 | 636 |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
637 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
|
638 if (osdtexCnt > 0 || eosdDispList) { |
13585 | 639 // 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
|
640 if (!scaled_osd) { |
19939 | 641 glMatrixMode(GL_PROJECTION); |
642 glPushMatrix(); | |
643 glLoadIdentity(); | |
644 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
|
645 } |
13585 | 646 glEnable(GL_BLEND); |
19936
f810e12fce63
use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0
reimar
parents:
19935
diff
changeset
|
647 if (eosdDispList) { |
19578 | 648 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
649 glCallList(eosdDispList); | |
650 } | |
19579 | 651 if (osdtexCnt > 0) { |
25951 | 652 glColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); |
19579 | 653 // draw OSD |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
654 #ifndef FAST_OSD |
25951 | 655 glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); |
19579 | 656 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
|
657 #endif |
25951 | 658 glBlendFunc(GL_SRC_ALPHA, GL_ONE); |
19579 | 659 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); |
660 } | |
13585 | 661 // set rendering parameters back to defaults |
28035 | 662 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
|
663 if (!scaled_osd) |
19939 | 664 glPopMatrix(); |
16099 | 665 BindTexture(gl_target, 0); |
13585 | 666 } |
26840 | 667 } |
13585 | 668 |
26840 | 669 static void flip_page(void) { |
26841
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
670 if (vo_doublebuffering) { |
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
671 if (use_glFinish) glFinish(); |
17116 | 672 swapGlBuffers(); |
26841
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
673 if (vo_fs && use_aspect) |
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
674 glClear(GL_COLOR_BUFFER_BIT); |
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
675 } else { |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
676 do_render(); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
677 do_render_osd(); |
26841
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
678 if (use_glFinish) glFinish(); |
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
679 else glFlush(); |
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
680 } |
1 | 681 } |
682 | |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
683 static void redraw(void) { |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
684 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
|
685 flip_page(); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
686 } |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
687 |
1 | 688 //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
|
689 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
1 | 690 { |
28035 | 691 mpi_flipped = stride[0] < 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
692 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
|
693 x, y, w, h, slice_height); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
694 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
695 ActiveTexture(GL_TEXTURE1); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
696 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
|
697 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
|
698 ActiveTexture(GL_TEXTURE2); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
699 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
|
700 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
|
701 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
702 } |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
703 return 0; |
1 | 704 } |
705 | |
16099 | 706 static uint32_t get_image(mp_image_t *mpi) { |
28065 | 707 int needed_size; |
16233
f00a2826ee11
use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents:
16221
diff
changeset
|
708 if (!GenBuffers || !BindBuffer || !BufferData || !MapBuffer) { |
16099 | 709 if (!err_shown) |
710 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n" | |
711 "Expect a _major_ speed penalty\n"); | |
16113 | 712 err_shown = 1; |
16099 | 713 return VO_FALSE; |
714 } | |
715 if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; | |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
716 if (mesa_buffer) mpi->width = texture_width; |
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
717 else if (ati_hack) { |
27874
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
718 mpi->width = texture_width; |
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
719 mpi->height = texture_height; |
27169
78d837adc71e
100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents:
27168
diff
changeset
|
720 } |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
721 mpi->stride[0] = mpi->width * mpi->bpp / 8; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
722 needed_size = mpi->stride[0] * mpi->height; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
723 if (mesa_buffer) { |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
724 #ifndef GL_WIN32 |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
725 if (mesa_bufferptr && needed_size > mesa_buffersize) { |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
726 FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
727 mesa_bufferptr = NULL; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
728 } |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
729 if (!mesa_bufferptr) |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
730 mesa_bufferptr = AllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 0, 0); |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
731 mesa_buffersize = needed_size; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
732 #endif |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
733 mpi->planes[0] = mesa_bufferptr; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
734 } else { |
28068 | 735 if (!gl_buffer) |
736 GenBuffers(1, &gl_buffer); | |
737 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); | |
738 if (needed_size > gl_buffersize) { | |
739 gl_buffersize = needed_size; | |
740 BufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize, | |
741 NULL, GL_DYNAMIC_DRAW); | |
742 } | |
743 if (!gl_bufferptr) | |
744 gl_bufferptr = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); | |
745 mpi->planes[0] = gl_bufferptr; | |
746 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); | |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
747 } |
28035 | 748 if (!mpi->planes[0]) { |
16113 | 749 if (!err_shown) |
25754 | 750 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n" |
16113 | 751 "Expect a _major_ speed penalty\n"); |
752 err_shown = 1; | |
753 return VO_FALSE; | |
754 } | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
755 if (mpi->imgfmt == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
756 // YV12 |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
757 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
|
758 mpi->stride[0] = mpi->width; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
759 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
|
760 mpi->stride[1] = mpi->width >> 1; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
761 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
|
762 mpi->stride[2] = mpi->width >> 1; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
763 if (ati_hack && !mesa_buffer) { |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
764 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
|
765 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
|
766 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
|
767 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
|
768 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
|
769 NULL, GL_DYNAMIC_DRAW); |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
770 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
|
771 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
|
772 NULL, GL_DYNAMIC_DRAW); |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
773 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
|
774 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
775 if (!gl_bufferptr_uv[0]) { |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
776 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
|
777 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
|
778 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
|
779 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
|
780 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
781 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
|
782 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
|
783 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
784 } |
16099 | 785 mpi->flags |= MP_IMGFLAG_DIRECT; |
786 return VO_TRUE; | |
787 } | |
788 | |
28164 | 789 static void clear_border(uint8_t *dst, int start, int stride, int height, int full_height, int value) { |
790 int right_border = stride - start; | |
791 int bottom_border = full_height - height; | |
792 while (height > 0) { | |
793 memset(dst + start, value, right_border); | |
794 dst += stride; | |
795 height--; | |
796 } | |
797 if (bottom_border > 0) | |
798 memset(dst, value, stride * bottom_border); | |
799 } | |
800 | |
16092 | 801 static uint32_t draw_image(mp_image_t *mpi) { |
16117 | 802 int slice = slice_height; |
26681 | 803 int stride[3]; |
804 unsigned char *planes[3]; | |
805 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
|
806 int w = mpi->w, h = mpi->h; |
16092 | 807 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
|
808 goto skip_upload; |
26681 | 809 mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; |
810 mpi2.width = mpi2.w; mpi2.height = mpi2.h; | |
811 if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) { | |
27089 | 812 int bpp = mpi->imgfmt == IMGFMT_YV12 ? 8 : mpi->bpp; |
813 memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp / 8, mpi->h, mpi2.stride[0], mpi->stride[0]); | |
26681 | 814 if (mpi->imgfmt == IMGFMT_YV12) { |
815 memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]); | |
816 memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]); | |
817 } | |
28164 | 818 if (ati_hack) { // since we have to do a full upload we need to clear the borders |
819 clear_border(mpi2.planes[0], mpi->w * bpp / 8, mpi2.stride[0], mpi->h, mpi2.height, 0); | |
820 if (mpi->imgfmt == IMGFMT_YV12) { | |
821 clear_border(mpi2.planes[1], mpi->w >> 1, mpi2.stride[1], mpi->h >> 1, mpi2.height >> 1, 128); | |
822 clear_border(mpi2.planes[2], mpi->w >> 1, mpi2.stride[2], mpi->h >> 1, mpi2.height >> 1, 128); | |
823 } | |
824 } | |
26681 | 825 mpi = &mpi2; |
826 } | |
827 stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2]; | |
828 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; | |
28035 | 829 mpi_flipped = stride[0] < 0; |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
830 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
28073 | 831 if (mesa_buffer) { |
832 glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); | |
833 w = texture_width; | |
834 } else { | |
28071 | 835 intptr_t base = (intptr_t)planes[0]; |
28072 | 836 if (ati_hack) { w = texture_width; h = texture_height; } |
28071 | 837 if (mpi_flipped) |
838 base += (mpi->h - 1) * stride[0]; | |
839 planes[0] -= base; | |
840 planes[1] -= base; | |
841 planes[2] -= base; | |
842 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); | |
843 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); | |
844 gl_bufferptr = NULL; | |
845 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) | |
846 planes[0] = planes[1] = planes[2] = NULL; | |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
847 } |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
848 slice = 0; // always "upload" full texture |
16099 | 849 } |
18995 | 850 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
|
851 mpi->x, mpi->y, w, h, slice); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
852 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
|
853 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
|
854 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
|
855 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
856 gl_bufferptr_uv[0] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
857 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
858 ActiveTexture(GL_TEXTURE1); |
18995 | 859 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
|
860 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
|
861 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
|
862 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
|
863 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
864 gl_bufferptr_uv[1] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
865 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
866 ActiveTexture(GL_TEXTURE2); |
18995 | 867 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
|
868 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
|
869 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
870 } |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
871 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
872 if (mesa_buffer) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 0); |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
873 else BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
874 } |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
875 skip_upload: |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
876 if (vo_doublebuffering) do_render(); |
16092 | 877 return VO_TRUE; |
878 } | |
1 | 879 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
880 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
|
881 draw_frame(uint8_t *src[]) |
1 | 882 { |
16092 | 883 return VO_ERROR; |
1 | 884 } |
885 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
886 static int |
1 | 887 query_format(uint32_t format) |
888 { | |
16092 | 889 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | |
18996 | 890 VFCAP_FLIP | |
16092 | 891 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE; |
13585 | 892 if (use_osd) |
23135
960434b7d963
Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd
reimar
parents:
23134
diff
changeset
|
893 caps |= VFCAP_OSD | VFCAP_EOSD | (scaled_osd ? 0 : VFCAP_EOSD_UNSCALED); |
28035 | 894 if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA) |
13585 | 895 return caps; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
896 if (use_yuv && format == IMGFMT_YV12) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
897 return caps; |
19356
595ac8077dc5
Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents:
18996
diff
changeset
|
898 // 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
|
899 // 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
|
900 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
|
901 return 0; |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
902 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
|
903 return 0; |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
904 if (many_fmts && |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
905 glFindFormat(format, NULL, NULL, NULL, NULL)) |
13585 | 906 return caps; |
1 | 907 return 0; |
908 } | |
909 | |
910 | |
911 static void | |
912 uninit(void) | |
913 { | |
28035 | 914 if (!vo_config_count) return; |
16433 | 915 uninitGl(); |
13843 | 916 releaseGlContext(&gl_vinfo, &gl_context); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
917 if (custom_prog) free(custom_prog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
918 custom_prog = NULL; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
919 if (custom_tex) free(custom_tex); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
920 custom_tex = NULL; |
17116 | 921 vo_uninit(); |
1 | 922 } |
4352 | 923 |
14286 | 924 static opt_t subopts[] = { |
925 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL}, | |
926 {"osd", OPT_ARG_BOOL, &use_osd, NULL}, | |
927 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL}, | |
928 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL}, | |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
929 {"ycbcr", OPT_ARG_BOOL, &use_ycbcr, NULL}, |
14286 | 930 {"slice-height", OPT_ARG_INT, &slice_height, (opt_test_f)int_non_neg}, |
16099 | 931 {"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
|
932 {"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
|
933 {"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
|
934 {"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
|
935 {"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
|
936 {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL}, |
26681 | 937 {"force-pbo", OPT_ARG_BOOL, &force_pbo, NULL}, |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
938 {"mesa-buffer", OPT_ARG_BOOL, &mesa_buffer, NULL}, |
16235 | 939 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, |
16268 | 940 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL}, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
941 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL}, |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
942 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL}, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
943 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL}, |
18963 | 944 {"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
|
945 {"osdcolor", OPT_ARG_INT, &osd_color, NULL}, |
14286 | 946 {NULL} |
947 }; | |
948 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
949 static int preinit(const char *arg) |
4352 | 950 { |
14286 | 951 // set defaults |
16012 | 952 many_fmts = 1; |
13585 | 953 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
|
954 scaled_osd = 0; |
13601 | 955 use_aspect = 1; |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
956 use_ycbcr = 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
957 use_yuv = 0; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
958 lscale = 0; |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
959 cscale = 0; |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
960 filter_strength = 0.5; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
961 use_rectangle = -1; |
16235 | 962 use_glFinish = 0; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
963 ati_hack = -1; |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
964 force_pbo = -1; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
965 mesa_buffer = 0; |
16268 | 966 swap_interval = 1; |
23878
e64c59f73527
Set -vo gl slice-height default to 0, the current default of 4 seems
reimar
parents:
23655
diff
changeset
|
967 slice_height = 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
968 custom_prog = NULL; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
969 custom_tex = NULL; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
970 custom_tlin = 1; |
18963 | 971 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
|
972 osd_color = 0xffffff; |
14286 | 973 if (subopt_parse(arg, subopts) != 0) { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
974 mp_msg(MSGT_VO, MSGL_FATAL, |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
975 "\n-vo gl command line help:\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
976 "Example: mplayer -vo gl:slice-height=4\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
977 "\nOptions:\n" |
22087 | 978 " nomanyfmts\n" |
979 " 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
|
980 " slice-height=<0-...>\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
981 " Slice size for texture transfer, 0 for whole image\n" |
13585 | 982 " noosd\n" |
983 " Do not use OpenGL OSD code\n" | |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
984 " scaled-osd\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
985 " Render OSD at movie resolution and scale it\n" |
13601 | 986 " noaspect\n" |
987 " Do not do aspect scaling\n" | |
16099 | 988 " rectangle=<0,1,2>\n" |
989 " 0: use power-of-two textures\n" | |
990 " 1: use texture_rectangle\n" | |
991 " 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
|
992 " ati-hack\n" |
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
993 " Workaround ATI bug with PBOs\n" |
26681 | 994 " force-pbo\n" |
995 " Force use of PBO even if this involves an extra memcpy\n" | |
16235 | 996 " glfinish\n" |
997 " Call glFinish() before swapping buffers\n" | |
16268 | 998 " swapinterval=<n>\n" |
999 " Interval in displayed frames between to buffer swaps.\n" | |
1000 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n" | |
1001 " 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
|
1002 " yuv=<n>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1003 " 0: use software YUV to RGB conversion.\n" |
16626 | 1004 " 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
|
1005 " 2: use fragment program.\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1006 " 3: use fragment program with gamma correction.\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1007 " 4: use fragment program with gamma correction via lookup.\n" |
16626 | 1008 " 5: use ATI-specific method (for older cards).\n" |
22087 | 1009 " 6: use lookup via 3D texture.\n" |
18695 | 1010 " lscale=<n>\n" |
1011 " 0: use standard bilinear scaling for luma.\n" | |
1012 " 1: use improved bicubic scaling for luma.\n" | |
22489 | 1013 " 2: use cubic in X, linear in Y direction scaling for luma.\n" |
25728 | 1014 " 3: as 1 but without using a lookup texture.\n" |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1015 " 4: experimental unsharp masking (sharpening).\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1016 " 5: experimental unsharp masking (sharpening) with larger radius.\n" |
18695 | 1017 " cscale=<n>\n" |
1018 " 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
|
1019 " filter-strength=<value>\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1020 " 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
|
1021 " customprog=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1022 " use a custom YUV conversion program\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1023 " customtex=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1024 " 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
|
1025 " nocustomtlin\n" |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1026 " use GL_NEAREST scaling for customtex texture\n" |
18963 | 1027 " customtrect\n" |
1028 " use texture_rectangle for customtex texture\n" | |
25952 | 1029 " 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
|
1030 " use the given color for the OSD\n" |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1031 " ycbcr\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1032 " 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
|
1033 "\n" ); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1034 return -1; |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1035 } |
16099 | 1036 if (use_rectangle == 1) |
1037 gl_target = GL_TEXTURE_RECTANGLE; | |
1038 else | |
1039 gl_target = GL_TEXTURE_2D; | |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
1040 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
|
1041 if (many_fmts) |
28035 | 1042 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
|
1043 "Use -vo gl:nomanyfmts if playback fails.\n"); |
28035 | 1044 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
|
1045 "(0 means image height).\n", slice_height); |
28035 | 1046 if (!vo_init()) return -1; // Can't open X11 |
7777 | 1047 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1048 return 0; |
4352 | 1049 } |
1050 | |
26822 | 1051 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE)) |
1052 #define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI))) | |
1053 #define MASK_GAMMA_SUPPORT (MASK_NOT_COMBINERS & ~(1 << YUV_CONVERSION_FRAGMENT)) | |
1054 | |
1055 static const struct { | |
1056 const char *name; | |
1057 int *value; | |
1058 int supportmask; | |
1059 } eq_map[] = { | |
1060 {"brightness", &eq_bri, MASK_NOT_COMBINERS}, | |
1061 {"contrast", &eq_cont, MASK_NOT_COMBINERS}, | |
1062 {"saturation", &eq_sat, MASK_ALL_YUV }, | |
1063 {"hue", &eq_hue, MASK_ALL_YUV }, | |
1064 {"gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1065 {"red_gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1066 {"green_gamma", &eq_ggamma, MASK_GAMMA_SUPPORT}, | |
1067 {"blue_gamma", &eq_bgamma, MASK_GAMMA_SUPPORT}, | |
1068 {NULL, NULL, 0 } | |
1069 }; | |
1070 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
1071 static int control(uint32_t request, void *data, ...) |
4352 | 1072 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1073 switch (request) { |
26823 | 1074 case VOCTRL_PAUSE: |
1075 case VOCTRL_RESUME: | |
1076 int_pause = (request == VOCTRL_PAUSE); | |
1077 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1078 case VOCTRL_QUERY_FORMAT: |
28035 | 1079 return query_format(*(uint32_t*)data); |
16099 | 1080 case VOCTRL_GET_IMAGE: |
1081 return get_image(data); | |
16092 | 1082 case VOCTRL_DRAW_IMAGE: |
1083 return draw_image(data); | |
19578 | 1084 case VOCTRL_DRAW_EOSD: |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1085 if (!data) |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1086 return VO_FALSE; |
19578 | 1087 genEOSD(data); |
1088 return VO_TRUE; | |
1089 case VOCTRL_GET_EOSD_RES: | |
1090 { | |
1091 mp_eosd_res_t *r = data; | |
1092 r->mt = r->mb = r->ml = r->mr = 0; | |
1093 if (scaled_osd) {r->w = image_width; r->h = image_height;} | |
1094 else if (vo_fs) { | |
1095 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
|
1096 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
|
1097 r->mt = r->mb = ass_border_y; |
19578 | 1098 } else { |
1099 r->w = vo_dwidth; r->h = vo_dheight; | |
1100 } | |
1101 } | |
1102 return VO_TRUE; | |
13843 | 1103 case VOCTRL_GUISUPPORT: |
1104 return VO_TRUE; | |
11542 | 1105 case VOCTRL_ONTOP: |
17116 | 1106 vo_ontop(); |
11542 | 1107 return VO_TRUE; |
6095 | 1108 case VOCTRL_FULLSCREEN: |
17116 | 1109 vo_fullscreen(); |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
1110 resize(vo_dwidth, vo_dheight); |
6095 | 1111 return VO_TRUE; |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1112 case VOCTRL_BORDER: |
27306
7a650839fc10
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
reimar
parents:
27184
diff
changeset
|
1113 vo_border(); |
25912 | 1114 resize(vo_dwidth, vo_dheight); |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1115 return VO_TRUE; |
13601 | 1116 case VOCTRL_GET_PANSCAN: |
1117 if (!use_aspect) return VO_NOTIMPL; | |
1118 return VO_TRUE; | |
1119 case VOCTRL_SET_PANSCAN: | |
1120 if (!use_aspect) return VO_NOTIMPL; | |
28035 | 1121 resize(vo_dwidth, vo_dheight); |
13601 | 1122 return VO_TRUE; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1123 case VOCTRL_GET_EQUALIZER: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1124 if (image_format == IMGFMT_YV12) { |
26822 | 1125 int i; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1126 va_list va; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1127 int *value; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1128 va_start(va, data); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1129 value = va_arg(va, int *); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1130 va_end(va); |
26822 | 1131 for (i = 0; eq_map[i].name; i++) |
1132 if (strcmp(data, eq_map[i].name) == 0) break; | |
1133 if (!(eq_map[i].supportmask & (1 << use_yuv))) | |
1134 break; | |
1135 *value = *eq_map[i].value; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1136 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1137 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1138 break; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1139 case VOCTRL_SET_EQUALIZER: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1140 if (image_format == IMGFMT_YV12) { |
26822 | 1141 int i; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1142 va_list va; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1143 int value; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1144 va_start(va, data); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1145 value = va_arg(va, int); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1146 va_end(va); |
26822 | 1147 for (i = 0; eq_map[i].name; i++) |
1148 if (strcmp(data, eq_map[i].name) == 0) break; | |
1149 if (!(eq_map[i].supportmask & (1 << use_yuv))) | |
1150 break; | |
1151 *eq_map[i].value = value; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1152 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1153 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1154 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1155 break; |
22232 | 1156 case VOCTRL_UPDATE_SCREENINFO: |
1157 update_xinerama_info(); | |
1158 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1159 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1160 return VO_NOTIMPL; |
4352 | 1161 } |