Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 36124:87653d6a0f47
Avoid PushMatrix/PopMatrix.
This makes it easier to support e.g. GLES2.
author | reimar |
---|---|
date | Sat, 04 May 2013 11:13:58 +0000 |
parents | 882f0da023b9 |
children | 18c289284727 |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
1 /* |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
2 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
3 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
7 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
8 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
12 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
13 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
31309
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
17 * |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
18 * You can alternatively redistribute this file and/or |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
19 * modify it under the terms of the GNU Lesser General Public |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
20 * License as published by the Free Software Foundation; either |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
21 * version 2.1 of the License, or (at your option) any later version. |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
22 */ |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
23 |
1 | 24 #include <stdio.h> |
25 #include <stdlib.h> | |
26 #include <string.h> | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
27 #include <math.h> |
1 | 28 |
16221 | 29 #include "config.h" |
32461 | 30 #include "sub/ass_mp.h" |
11988 | 31 #include "mp_msg.h" |
14286 | 32 #include "subopt-helper.h" |
1 | 33 #include "video_out.h" |
34 #include "video_out_internal.h" | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
35 #include "libmpcodecs/vf.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
36 #include "sub/font_load.h" |
32467 | 37 #include "sub/sub.h" |
1 | 38 |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
39 #include "gl_common.h" |
2057 | 40 #include "aspect.h" |
26681 | 41 #include "fastmemcpy.h" |
32460 | 42 #include "sub/eosd.h" |
31 | 43 |
31022 | 44 #ifdef CONFIG_GL_SDL |
34812 | 45 #include "sdl_common.h" |
31022 | 46 #endif |
47 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
48 static const vo_info_t info = |
1 | 49 { |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
50 "OpenGL", |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
51 "gl", |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
52 "Reimar Doeffinger <Reimar.Doeffinger@gmx.de>", |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
53 "" |
1 | 54 }; |
55 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
56 const LIBVO_EXTERN(gl) |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
57 |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
58 |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
59 static const vo_info_t info_nosw = |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
60 { |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
61 "OpenGL no software rendering", |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
62 "gl_nosw", |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
63 "Reimar Doeffinger <Reimar.Doeffinger@gmx.de>", |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
64 "" |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
65 }; |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
66 static int preinit_nosw(const char *arg); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
67 #define info info_nosw |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
68 #define preinit preinit_nosw |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
69 const LIBVO_EXTERN(gl_nosw) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
70 #undef info |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
71 #undef preinit |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
72 |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
73 static MPGLContext glctx; |
1 | 74 |
13599 | 75 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
|
76 static int scaled_osd; |
14269 | 77 //! How many parts the OSD may consist of at most |
13585 | 78 #define MAX_OSD_PARTS 20 |
14269 | 79 //! Textures for OSD |
13599 | 80 static GLuint osdtex[MAX_OSD_PARTS]; |
13585 | 81 #ifndef FAST_OSD |
14269 | 82 //! Alpha textures for OSD |
13599 | 83 static GLuint osdatex[MAX_OSD_PARTS]; |
13585 | 84 #endif |
35011 | 85 //! Coordinates and texture sizes for OSD |
86 static struct osdcoords { | |
87 int x, y, w, h, sx, sy; | |
88 } osdcoords[MAX_OSD_PARTS]; | |
19578 | 89 static GLuint *eosdtex; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
90 #define LARGE_EOSD_TEX_SIZE 512 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
91 #define TINYTEX_SIZE 16 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
92 #define TINYTEX_COLS (LARGE_EOSD_TEX_SIZE/TINYTEX_SIZE) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
93 #define TINYTEX_MAX (TINYTEX_COLS*TINYTEX_COLS) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
94 #define SMALLTEX_SIZE 32 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
95 #define SMALLTEX_COLS (LARGE_EOSD_TEX_SIZE/SMALLTEX_SIZE) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
96 #define SMALLTEX_MAX (SMALLTEX_COLS*SMALLTEX_COLS) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
97 static GLuint largeeosdtex[2]; |
35011 | 98 //! Display list that draws the EOSD parts |
19578 | 99 static GLuint eosdDispList; |
14269 | 100 //! How many parts the OSD currently consists of |
16433 | 101 static int osdtexCnt; |
19578 | 102 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
|
103 static int osd_color; |
1 | 104 |
13601 | 105 static int use_aspect; |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
106 static int use_ycbcr; |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
107 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE)) |
36106 | 108 #define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI) | (1 << YUV_CONVERSION_TEXT_FRAGMENT))) |
36105
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
109 #define MASK_GAMMA_SUPPORT MASK_NOT_COMBINERS |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
110 static int use_yuv; |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
111 static int colorspace; |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
112 static int levelconv; |
30097 | 113 static int is_yuv; |
36111 | 114 static int is_xyz; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
115 static int lscale; |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
116 static int cscale; |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
117 static float filter_strength; |
33927 | 118 static float noise_strength; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
119 static int yuvconvtype; |
16099 | 120 static int use_rectangle; |
35005 | 121 static int using_tex_rect; |
16099 | 122 static int err_shown; |
1 | 123 static uint32_t image_width; |
124 static uint32_t image_height; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
125 static uint32_t image_format; |
12159 | 126 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
|
127 static int ati_hack; |
26681 | 128 static int force_pbo; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
129 static int mesa_buffer; |
16235 | 130 static int use_glFinish; |
16268 | 131 static int swap_interval; |
16099 | 132 static GLenum gl_target; |
16303
a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents:
16282
diff
changeset
|
133 static GLint gl_texfmt; |
12159 | 134 static GLenum gl_format; |
135 static GLenum gl_type; | |
16434 | 136 static GLuint gl_buffer; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
137 static GLuint gl_buffer_uv[2]; |
16099 | 138 static int gl_buffersize; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
139 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
|
140 static void *gl_bufferptr; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
141 static void *gl_bufferptr_uv[2]; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
142 static int mesa_buffersize; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
143 static void *mesa_bufferptr; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
144 static GLuint fragprog; |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
145 static GLuint default_texs[22]; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
146 static char *custom_prog; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
147 static char *custom_tex; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
148 static int custom_tlin; |
18963 | 149 static int custom_trect; |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
150 static int mipmap_gen; |
31567 | 151 static int stereo_mode; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
152 static int stipple; |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
153 static enum MPGLType backend; |
1 | 154 |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
155 static int eq_bri = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
156 static int eq_cont = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
157 static int eq_sat = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
158 static int eq_hue = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
159 static int eq_rgamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
160 static int eq_ggamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
161 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
|
162 |
16879
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
163 static int texture_width; |
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
164 static int texture_height; |
17220 | 165 static int mpi_flipped; |
18996 | 166 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
|
167 static int ass_border_x, ass_border_y; |
1 | 168 |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
169 static unsigned int slice_height = 1; |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
170 |
34819 | 171 // performance statistics |
172 static int imgcnt, dr_imgcnt, dr_rejectcnt; | |
173 | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
174 static int did_render; |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
175 |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
176 static void redraw(void); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
177 |
36124 | 178 static float video_matrix[16]; |
179 | |
612 | 180 static void resize(int x,int y){ |
34337
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
181 // simple orthogonal projection for 0-image_width;0-image_height |
36124 | 182 memset(video_matrix, 0, sizeof(video_matrix)); |
183 video_matrix[0] = 2.0/image_width; | |
184 video_matrix[5] = -2.0/image_height; | |
185 video_matrix[12] = -1; | |
186 video_matrix[13] = 1; | |
187 video_matrix[15] = 1; | |
11988 | 188 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y); |
15748 | 189 if (WinID >= 0) { |
31534
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
190 int left = 0, top = 0, w = x, h = y; |
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
191 geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight); |
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
192 top = y - h - top; |
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
193 mpglViewport(left, top, w, h); |
15748 | 194 } else |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
195 mpglViewport( 0, 0, x, y ); |
1 | 196 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
197 mpglMatrixMode(GL_PROJECTION); |
28590
d1ca19ff9b52
100l, reset ass_border when switching out of fullscreen mode.
reimar
parents:
28446
diff
changeset
|
198 ass_border_x = ass_border_y = 0; |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
199 if (aspect_scaling() && use_aspect) { |
13601 | 200 int new_w, new_h; |
35888
f464ea910bd2
Better compatibility with more restricted GL headers.
reimar
parents:
35830
diff
changeset
|
201 double scale_x, scale_y; |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
202 aspect(&new_w, &new_h, A_WINZOOM); |
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
203 panscan_calc_windowed(); |
13601 | 204 new_w += vo_panscan_x; |
205 new_h += vo_panscan_y; | |
35888
f464ea910bd2
Better compatibility with more restricted GL headers.
reimar
parents:
35830
diff
changeset
|
206 scale_x = (double)new_w / (double)x; |
f464ea910bd2
Better compatibility with more restricted GL headers.
reimar
parents:
35830
diff
changeset
|
207 scale_y = (double)new_h / (double)y; |
36124 | 208 video_matrix[0] *= scale_x; |
209 video_matrix[12] *= scale_x; | |
210 video_matrix[5] *= scale_y; | |
211 video_matrix[13] *= scale_y; | |
29519
0421934c81ac
Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
reimar
parents:
29514
diff
changeset
|
212 ass_border_x = (vo_dwidth - new_w) / 2; |
0421934c81ac
Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
reimar
parents:
29514
diff
changeset
|
213 ass_border_y = (vo_dheight - new_h) / 2; |
13601 | 214 } |
36124 | 215 mpglLoadMatrixf(video_matrix); |
1 | 216 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
217 mpglMatrixMode(GL_MODELVIEW); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
218 mpglLoadIdentity(); |
13585 | 219 |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
220 if (!scaled_osd) { |
27393 | 221 #ifdef CONFIG_FREETYPE |
31573 | 222 // adjust font size to display size |
223 force_load_font = 1; | |
15086
c9eee448e5b2
revert the previous commit, gl needs to reload the font immediately
henry
parents:
15080
diff
changeset
|
224 #endif |
31573 | 225 vo_osd_changed(OSDTYPE_OSD); |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
226 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
227 mpglClear(GL_COLOR_BUFFER_BIT); |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
228 redraw(); |
1 | 229 } |
230 | |
16099 | 231 static void texSize(int w, int h, int *texw, int *texh) { |
232 if (use_rectangle) { | |
233 *texw = w; *texh = h; | |
234 } else { | |
235 *texw = 32; | |
236 while (*texw < w) | |
237 *texw *= 2; | |
238 *texh = 32; | |
239 while (*texh < h) | |
240 *texh *= 2; | |
241 } | |
28073 | 242 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
|
243 else if (ati_hack) *texw = (*texw + 511) & ~511; |
16099 | 244 } |
245 | |
16595
b3a9fb41f475
fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents:
16593
diff
changeset
|
246 //! maximum size of custom fragment program |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
247 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024) |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
248 static void update_yuvconv(void) { |
33414 | 249 int xs, ys, depth; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
250 float bri = eq_bri / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
251 float cont = (eq_cont + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
252 float hue = eq_hue / 100.0 * 3.1415927; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
253 float sat = (eq_sat + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
254 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
|
255 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
|
256 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
|
257 gl_conversion_params_t params = {gl_target, yuvconvtype, |
33414 | 258 {colorspace, levelconv, bri, cont, hue, sat, rgamma, ggamma, bgamma, 0}, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
259 texture_width, texture_height, 0, 0, filter_strength, noise_strength, |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
260 stereo_mode == GL_3D_STIPPLE}; |
33414 | 261 mp_get_chroma_shift(image_format, &xs, &ys, &depth); |
30097 | 262 params.chrom_texw = params.texw >> xs; |
263 params.chrom_texh = params.texh >> ys; | |
33414 | 264 params.csp_params.input_shift = -depth & 7; |
36111 | 265 params.is_planar = is_yuv; |
266 if (is_xyz) { | |
267 params.csp_params.format = MP_CSP_XYZ; | |
268 params.csp_params.input_shift = 0; | |
269 params.csp_params.rgamma *= 2.2; | |
270 params.csp_params.ggamma *= 2.2; | |
271 params.csp_params.bgamma *= 2.2; | |
272 } | |
26834
aadfce1c25c8
Use a struct instead of a huge and further growing argument list.
reimar
parents:
26823
diff
changeset
|
273 glSetupYUVConversion(¶ms); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
274 if (custom_prog) { |
30994
38a0aa0ac675
Open cutomtex file in binary mode to avoid potential issues on
reimar
parents:
30964
diff
changeset
|
275 FILE *f = fopen(custom_prog, "rb"); |
31573 | 276 if (!f) { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
277 mp_msg(MSGT_VO, MSGL_WARN, |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
278 "[gl] Could not read customprog %s\n", custom_prog); |
31573 | 279 } else { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
280 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
|
281 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
282 fclose(f); |
18653
5af43a16abc3
loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents:
18619
diff
changeset
|
283 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
284 free(prog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
285 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
286 mpglProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0, |
18960 | 287 1.0 / texture_width, 1.0 / texture_height, |
288 texture_width, texture_height); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
289 } |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
290 if (custom_tex) { |
31064
7d174bdfcd9a
100l, open the customtex also in binary mode, not just the program.
reimar
parents:
31044
diff
changeset
|
291 FILE *f = fopen(custom_tex, "rb"); |
31573 | 292 if (!f) { |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
293 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
294 "[gl] Could not read customtex %s\n", custom_tex); |
31573 | 295 } else { |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
296 int width, height, maxval; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
297 mpglActiveTexture(GL_TEXTURE3); |
18963 | 298 if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0, |
31573 | 299 custom_tlin?GL_LINEAR:GL_NEAREST, |
300 f, &width, &height, &maxval)) { | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
301 mpglProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1, |
18960 | 302 1.0 / width, 1.0 / height, width, height); |
31573 | 303 } else |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
304 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
305 "[gl] Error parsing customtex %s\n", custom_tex); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
306 fclose(f); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
307 mpglActiveTexture(GL_TEXTURE0); |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
308 } |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
309 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
310 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
311 |
16436 | 312 /** |
313 * \brief remove all OSD textures and display-lists, thus clearing it. | |
314 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
315 static void clearOSD(void) { |
17871
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
316 if (!osdtexCnt) |
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
317 return; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
318 mpglDeleteTextures(osdtexCnt, osdtex); |
16433 | 319 #ifndef FAST_OSD |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
320 mpglDeleteTextures(osdtexCnt, osdatex); |
16433 | 321 #endif |
322 osdtexCnt = 0; | |
323 } | |
324 | |
325 /** | |
19578 | 326 * \brief remove textures, display list and free memory used by EOSD |
327 */ | |
328 static void clearEOSD(void) { | |
19934 | 329 if (eosdDispList) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
330 mpglDeleteLists(eosdDispList, 1); |
19934 | 331 eosdDispList = 0; |
332 if (eosdtexCnt) | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
333 mpglDeleteTextures(eosdtexCnt, eosdtex); |
19934 | 334 eosdtexCnt = 0; |
19578 | 335 free(eosdtex); |
336 eosdtex = NULL; | |
337 } | |
338 | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
339 static inline int is_tinytex(struct mp_eosd_image *i, int tinytexcur) { |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
340 return i->w < TINYTEX_SIZE && i->h < TINYTEX_SIZE && tinytexcur < TINYTEX_MAX; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
341 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
342 |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
343 static inline int is_smalltex(struct mp_eosd_image *i, int smalltexcur) { |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
344 return i->w < SMALLTEX_SIZE && i->h < SMALLTEX_SIZE && smalltexcur < SMALLTEX_MAX; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
345 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
346 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
347 static inline void tinytex_pos(int tinytexcur, int *x, int *y) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
348 *x = (tinytexcur % TINYTEX_COLS) * TINYTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
349 *y = (tinytexcur / TINYTEX_COLS) * TINYTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
350 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
351 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
352 static inline void smalltex_pos(int smalltexcur, int *x, int *y) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
353 *x = (smalltexcur % SMALLTEX_COLS) * SMALLTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
354 *y = (smalltexcur / SMALLTEX_COLS) * SMALLTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
355 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
356 |
19578 | 357 /** |
358 * \brief construct display list from ass image list | |
359 * \param img image list to create OSD from. | |
360 * A value of NULL has the same effect as clearEOSD() | |
361 */ | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
362 static void genEOSD(struct mp_eosd_image_list *imgs) { |
19578 | 363 int sx, sy; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
364 int tinytexcur = 0; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
365 int smalltexcur = 0; |
19578 | 366 GLuint *curtex; |
28035 | 367 GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
368 struct mp_eosd_image *img = eosd_image_first(imgs); |
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
369 struct mp_eosd_image *i; |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
370 |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
371 if (imgs->changed == 0) // there are elements, but they are unchanged |
28808
49aaf6f7052b
Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,
reimar
parents:
28803
diff
changeset
|
372 return; |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
373 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
|
374 goto skip_upload; |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
375 |
19578 | 376 clearEOSD(); |
19935
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
377 if (!img) |
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
378 return; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
379 if (!largeeosdtex[0]) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
380 mpglGenTextures(2, largeeosdtex); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
381 mpglBindTexture(gl_target, largeeosdtex[0]); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
382 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, LARGE_EOSD_TEX_SIZE, LARGE_EOSD_TEX_SIZE, 0); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
383 mpglBindTexture(gl_target, largeeosdtex[1]); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
384 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, LARGE_EOSD_TEX_SIZE, LARGE_EOSD_TEX_SIZE, 0); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
385 } |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
386 for (i = img; i; i = eosd_image_next(imgs)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
387 { |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
388 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
|
389 continue; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
390 if (is_tinytex(i, tinytexcur)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
391 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
392 else if (is_smalltex(i, smalltexcur)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
393 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
394 else |
19939 | 395 eosdtexCnt++; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
396 } |
20084 | 397 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n", |
398 tinytexcur, smalltexcur, eosdtexCnt); | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
399 if (eosdtexCnt) { |
19939 | 400 eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
401 mpglGenTextures(eosdtexCnt, eosdtex); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
402 } |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
403 tinytexcur = smalltexcur = 0; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
404 for (i = eosd_image_first(imgs), curtex = eosdtex; i; i = eosd_image_next(imgs)) { |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
405 int x = 0, y = 0; |
19578 | 406 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) { |
407 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n"); | |
408 continue; | |
409 } | |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
410 if (is_tinytex(i, tinytexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
411 tinytex_pos(tinytexcur, &x, &y); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
412 mpglBindTexture(gl_target, largeeosdtex[0]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
413 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
414 } else if (is_smalltex(i, smalltexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
415 smalltex_pos(smalltexcur, &x, &y); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
416 mpglBindTexture(gl_target, largeeosdtex[1]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
417 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
418 } else { |
19939 | 419 texSize(i->w, i->h, &sx, &sy); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
420 mpglBindTexture(gl_target, *curtex++); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
421 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
|
422 } |
19578 | 423 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
|
424 x, y, i->w, i->h, 0); |
19578 | 425 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
426 eosdDispList = mpglGenLists(1); |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
427 skip_upload: |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
428 mpglNewList(eosdDispList, GL_COMPILE); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
429 tinytexcur = smalltexcur = 0; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
430 for (i = eosd_image_first(imgs), curtex = eosdtex; i; i = eosd_image_next(imgs)) { |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
431 int x = 0, y = 0; |
19578 | 432 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) |
433 continue; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
434 mpglColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff)); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
435 if (is_tinytex(i, tinytexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
436 tinytex_pos(tinytexcur, &x, &y); |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
437 sx = sy = LARGE_EOSD_TEX_SIZE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
438 mpglBindTexture(gl_target, largeeosdtex[0]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
439 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
440 } else if (is_smalltex(i, smalltexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
441 smalltex_pos(smalltexcur, &x, &y); |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
442 sx = sy = LARGE_EOSD_TEX_SIZE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
443 mpglBindTexture(gl_target, largeeosdtex[1]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
444 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
445 } else { |
19939 | 446 texSize(i->w, i->h, &sx, &sy); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
447 mpglBindTexture(gl_target, *curtex++); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
448 } |
35005 | 449 glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, using_tex_rect, 0, 0, 0); |
19578 | 450 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
451 mpglEndList(); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
452 mpglBindTexture(gl_target, 0); |
19578 | 453 } |
454 | |
455 /** | |
16433 | 456 * \brief uninitialize OpenGL context, freeing textures, buffers etc. |
457 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
458 static void uninitGl(void) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
459 int i = 0; |
34819 | 460 mp_msg(MSGT_VO, MSGL_V, "Drawn %i frames, %i using DR, DR refused %i\n", |
461 imgcnt, dr_imgcnt, dr_rejectcnt); | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
462 if (mpglDeletePrograms && fragprog) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
463 mpglDeletePrograms(1, &fragprog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
464 fragprog = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
465 while (default_texs[i] != 0) |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
466 i++; |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
467 if (i) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
468 mpglDeleteTextures(i, default_texs); |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
469 default_texs[0] = 0; |
16433 | 470 clearOSD(); |
19578 | 471 clearEOSD(); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
472 if (largeeosdtex[0]) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
473 mpglDeleteTextures(2, largeeosdtex); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
474 largeeosdtex[0] = 0; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
475 if (mpglDeleteBuffers && gl_buffer) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
476 mpglDeleteBuffers(1, &gl_buffer); |
16433 | 477 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
|
478 gl_bufferptr = NULL; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
479 if (mpglDeleteBuffers && gl_buffer_uv[0]) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
480 mpglDeleteBuffers(2, gl_buffer_uv); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
481 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
|
482 gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0; |
30023 | 483 #ifdef CONFIG_GL_X11 |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
484 if (mesa_bufferptr) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
485 mpglFreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
29648
74f94f407c31
Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents:
29646
diff
changeset
|
486 #endif |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
487 mesa_bufferptr = NULL; |
16433 | 488 err_shown = 0; |
489 } | |
490 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
491 static int isSoftwareGl(void) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
492 { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
493 const char *renderer = mpglGetString(GL_RENDERER); |
32632
d9764e977f12
llvmpipe, while only slow instead of insanely slow, is a software renderer.
reimar
parents:
32537
diff
changeset
|
494 return !renderer || strcmp(renderer, "Software Rasterizer") == 0 || |
d9764e977f12
llvmpipe, while only slow instead of insanely slow, is a software renderer.
reimar
parents:
32537
diff
changeset
|
495 strstr(renderer, "llvmpipe"); |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
496 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
497 |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
498 static void autodetectGlExtensions(void) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
499 const char *extensions = mpglGetString(GL_EXTENSIONS); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
500 const char *vendor = mpglGetString(GL_VENDOR); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
501 const char *version = mpglGetString(GL_VERSION); |
31070
52eb10f9e51e
Also print OpenGL renderer string with vendor and version with -v
reimar
parents:
31064
diff
changeset
|
502 const char *renderer = mpglGetString(GL_RENDERER); |
31022 | 503 int is_ati = vendor && strstr(vendor, "ATI") != NULL; |
28423
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
504 int ati_broken_pbo = 0; |
31070
52eb10f9e51e
Also print OpenGL renderer string with vendor and version with -v
reimar
parents:
31064
diff
changeset
|
505 mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL '%s' by '%s', version '%s'\n", renderer, vendor, version); |
28423
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
506 if (is_ati && strncmp(version, "2.1.", 4) == 0) { |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
507 int ver = atoi(version + 4); |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
508 mp_msg(MSGT_VO, MSGL_V, "[gl] Detected ATI driver version: %i\n", ver); |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
509 ati_broken_pbo = ver && ver < 8395; |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
510 } |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
511 if (ati_hack == -1) ati_hack = ati_broken_pbo; |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
512 if (force_pbo == -1) { |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
513 force_pbo = 0; |
34818 | 514 // memcpy is just too slow at least on PPC. |
515 if (ARCH_X86 && extensions && strstr(extensions, "_pixel_buffer_object")) | |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
516 force_pbo = is_ati; |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
517 } |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
518 if (use_rectangle == -1) { |
31093 | 519 use_rectangle = 0; |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
520 if (extensions) { |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
521 // if (strstr(extensions, "_texture_non_power_of_two")) |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
522 if (strstr(extensions, "_texture_rectangle")) |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
523 use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0; |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
524 } |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
525 } |
31023
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
526 if (use_osd == -1) |
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
527 use_osd = mpglBindTexture != NULL; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
528 if (use_yuv == -1) { |
30964
a5c6b37b3af6
Factor out the YUV->RGB conversion auto-selection and also
reimar
parents:
30945
diff
changeset
|
529 use_yuv = glAutodetectYUVConversion(); |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
530 if (stereo_mode == GL_3D_STIPPLE && |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
531 !glYUVSupportsAlphaTex(use_yuv)) |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
532 use_yuv = 0; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
533 } |
35008 | 534 if (use_ycbcr == -1) |
535 use_ycbcr = extensions && strstr(extensions, "ycbcr_422"); | |
28153
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
536 if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2)) |
28424 | 537 mp_msg(MSGT_VO, MSGL_WARN, "[gl] Selected scaling mode may be broken on ATI cards.\n" |
28153
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
538 "Tell _them_ to fix GL_REPEAT if you have issues.\n"); |
35008 | 539 mp_msg(MSGT_VO, MSGL_V, "[gl] Settings after autodetection: ati-hack = %i, force-pbo = %i, rectangle = %i, yuv = %i, ycbcr = %i\n", |
540 ati_hack, force_pbo, use_rectangle, use_yuv, use_ycbcr); | |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
541 } |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
542 |
31677 | 543 static GLint get_scale_type(int chroma) { |
544 int nearest = (chroma ? cscale : lscale) & 64; | |
545 if (nearest) | |
546 return mipmap_gen ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST; | |
547 return mipmap_gen ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR; | |
548 } | |
549 | |
13843 | 550 /** |
551 * \brief Initialize a (new or reused) OpenGL context. | |
16433 | 552 * set global gl-related variables to their default values |
13843 | 553 */ |
554 static int initGl(uint32_t d_width, uint32_t d_height) { | |
31677 | 555 GLint scale_type = get_scale_type(0); |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
556 autodetectGlExtensions(); |
35005 | 557 using_tex_rect = gl_format == GL_YCBCR_422_APPLE || use_rectangle == 1; |
558 gl_target = using_tex_rect ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D; | |
31676
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
559 yuvconvtype = SET_YUV_CONVERSION(use_yuv) | |
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
560 SET_YUV_LUM_SCALER(lscale) | |
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
561 SET_YUV_CHROM_SCALER(cscale); |
30446
f77e32f1ecc0
Avoid using options before autodetectGlExtensions to allow it to change them properly.
reimar
parents:
30445
diff
changeset
|
562 |
16099 | 563 texSize(image_width, image_height, &texture_width, &texture_height); |
13843 | 564 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
565 mpglDisable(GL_BLEND); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
566 mpglDisable(GL_DEPTH_TEST); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
567 mpglDepthMask(GL_FALSE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
568 mpglDisable(GL_CULL_FACE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
569 mpglEnable(gl_target); |
34338 | 570 if (mpglDrawBuffer) |
571 mpglDrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT); | |
34839
5e29e950d918
Do not needlessly modulate the texture color with the vertex color.
reimar
parents:
34819
diff
changeset
|
572 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); |
13843 | 573 |
574 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n", | |
575 texture_width, texture_height); | |
576 | |
31674
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
577 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
578 texture_width, texture_height, 0); |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
579 if (mipmap_gen) |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
580 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
581 |
36111 | 582 if (is_yuv || is_xyz || custom_prog || stereo_mode == GL_3D_STIPPLE) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
583 int i; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
584 mpglGenTextures(21, default_texs); |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
585 default_texs[21] = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
586 for (i = 0; i < 7; i++) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
587 mpglActiveTexture(GL_TEXTURE1 + i); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
588 mpglBindTexture(GL_TEXTURE_2D, default_texs[i]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
589 mpglBindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
590 mpglBindTexture(GL_TEXTURE_3D, default_texs[i + 14]); |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
591 } |
36113 | 592 mpglActiveTexture(GL_TEXTURE0); |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
593 } |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
594 if (stereo_mode == GL_3D_STIPPLE) |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
595 glSetupAlphaStippleTex(stipple); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
596 if (is_yuv) { |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
597 int xs, ys, depth; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
598 int chroma_clear_val = 128; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
599 scale_type = get_scale_type(1); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
600 mp_get_chroma_shift(image_format, &xs, &ys, &depth); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
601 chroma_clear_val >>= -depth & 7; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
602 mpglActiveTexture(GL_TEXTURE1); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
603 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
33416
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
604 texture_width >> xs, texture_height >> ys, |
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
605 chroma_clear_val); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
606 if (mipmap_gen) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
607 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
608 mpglActiveTexture(GL_TEXTURE2); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
609 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
33416
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
610 texture_width >> xs, texture_height >> ys, |
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
611 chroma_clear_val); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
612 if (mipmap_gen) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
613 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
614 mpglActiveTexture(GL_TEXTURE0); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
615 mpglBindTexture(gl_target, 0); |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
616 } |
36111 | 617 if (is_yuv || is_xyz || custom_prog) |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
618 { |
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
619 if ((MASK_NOT_COMBINERS & (1 << use_yuv)) || custom_prog) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
620 if (!mpglGenPrograms || !mpglBindProgram) { |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
621 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n"); |
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
622 } else { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
623 mpglGenPrograms(1, &fragprog); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
624 mpglBindProgram(GL_FRAGMENT_PROGRAM, fragprog); |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
625 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
626 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
627 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
628 } |
13843 | 629 |
630 resize(d_width, d_height); | |
631 | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
632 mpglClearColor( 0.0f,0.0f,0.0f,0.0f ); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
633 mpglClear( GL_COLOR_BUFFER_BIT ); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
634 if (mpglSwapInterval && swap_interval >= 0) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
635 mpglSwapInterval(swap_interval); |
13920 | 636 return 1; |
13843 | 637 } |
638 | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
639 static int create_window(uint32_t d_width, uint32_t d_height, uint32_t flags, const char *title) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
640 { |
32533
c41773445d3b
gl/win32: select a stereo pixel format for window when
reimar
parents:
32467
diff
changeset
|
641 if (stereo_mode == GL_3D_QUADBUFFER) |
c41773445d3b
gl/win32: select a stereo pixel format for window when
reimar
parents:
32467
diff
changeset
|
642 flags |= VOFLAG_STEREO; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
643 #ifdef CONFIG_GL_WIN32 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
644 if (glctx.type == GLTYPE_W32 && !vo_w32_config(d_width, d_height, flags)) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
645 return -1; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
646 #endif |
35089
a87c434ecaa3
Allow compiling -vo gl with OSX backend even if X11 and SDL are not available.
reimar
parents:
35087
diff
changeset
|
647 #ifdef CONFIG_GL_OSX |
35087 | 648 if (glctx.type == GLTYPE_OSX && !vo_osx_config(d_width, d_height, flags)) |
649 return -1; | |
650 #endif | |
34338 | 651 #ifdef CONFIG_GL_EGL_X11 |
652 if (glctx.type == GLTYPE_EGL_X11) { | |
653 XVisualInfo vinfo = { .visual = CopyFromParent, .depth = CopyFromParent }; | |
654 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height, flags, | |
655 CopyFromParent, "gl", title); | |
656 } | |
657 #endif | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
658 #ifdef CONFIG_GL_X11 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
659 if (glctx.type == GLTYPE_X11) { |
31573 | 660 static int default_glx_attribs[] = { |
661 GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, | |
662 GLX_DOUBLEBUFFER, None | |
663 }; | |
31572
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
664 static int stereo_glx_attribs[] = { |
31573 | 665 GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, |
31572
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
666 GLX_DOUBLEBUFFER, GLX_STEREO, None |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
667 }; |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
668 XVisualInfo *vinfo = NULL; |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
669 if (stereo_mode == GL_3D_QUADBUFFER) { |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
670 vinfo = glXChooseVisual(mDisplay, mScreen, stereo_glx_attribs); |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
671 if (!vinfo) |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
672 mp_msg(MSGT_VO, MSGL_ERR, "[gl] Could not find a stereo visual, " |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
673 "3D will probably not work!\n"); |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
674 } |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
675 if (!vinfo) |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
676 vinfo = glXChooseVisual(mDisplay, mScreen, default_glx_attribs); |
31573 | 677 if (!vinfo) { |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
678 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n"); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
679 return -1; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
680 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
681 mp_msg(MSGT_VO, MSGL_V, "[gl] GLX chose visual with ID 0x%x\n", (int)vinfo->visualid); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
682 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
683 vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, flags, |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
684 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone), |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
685 "gl", title); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
686 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
687 #endif |
31022 | 688 #ifdef CONFIG_GL_SDL |
689 if (glctx.type == GLTYPE_SDL) { | |
34845 | 690 // Ugly to do this here, but SDL ignores it if set later |
34874 | 691 if (swap_interval >= 0) { |
692 #if SDL_VERSION_ATLEAST(1, 3, 0) | |
693 SDL_GL_SetSwapInterval(swap_interval); | |
694 #elif SDL_VERSION_ATLEAST(1, 2, 10) | |
695 SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, swap_interval); | |
34845 | 696 #endif |
34874 | 697 } |
34812 | 698 if (!vo_sdl_config(d_width, d_height, flags, title)) |
699 return -1; | |
31022 | 700 } |
701 #endif | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
702 return 0; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
703 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
704 |
35092 | 705 #ifdef CONFIG_GL_OSX |
706 static void osx_redraw(void) | |
707 { | |
35095
dfa2e1b78664
Remove duplicate redraw call, resize already calls it.
reimar
parents:
35093
diff
changeset
|
708 // resize will call redraw to refresh the screen |
35092 | 709 resize(vo_dwidth, vo_dheight); |
710 } | |
711 #endif | |
712 | |
1 | 713 /* connect to server, create and map window, |
714 * allocate colors and (shared) memory | |
715 */ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
716 static int |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
717 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 718 { |
30097 | 719 int xs, ys; |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
720 image_height = height; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
721 image_width = width; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
722 image_format = format; |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
723 is_yuv = mp_get_chroma_shift(image_format, &xs, &ys, NULL) > 0; |
30097 | 724 is_yuv |= (xs << 8) | (ys << 16); |
36111 | 725 is_xyz = IMGFMT_IS_XYZ(image_format); |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
726 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
|
727 |
35895
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
728 if (glctx.type == GLTYPE_OSX && vo_doublebuffering && !is_yuv) { |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
729 // doublebuffering causes issues when e.g. drawing yuy2 or rgb textures |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
730 // (nothing is draw) unless using glfinish which makes things slow. |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
731 // This is possibly because we do not actually request a double-buffered |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
732 // context. |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
733 // However single-buffering causes slowdown and artefacts when |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
734 // drawing planar formats. Mostly tested on PPC MacMini |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
735 mp_msg(MSGT_VO, MSGL_INFO, "[gl] -double not supported on OSX for interleaved formats, switching to -nodouble\n"); |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
736 vo_doublebuffering = 0; |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
737 } |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
738 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
|
739 |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
740 if (create_window(d_width, d_height, flags, title) < 0) |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
741 return -1; |
15748 | 742 |
16433 | 743 if (vo_config_count) |
744 uninitGl(); | |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
745 if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED) |
29570
eb2567b65311
Check setGlWindow return value to fail properly instead of crashing if e.g.
reimar
parents:
29524
diff
changeset
|
746 return -1; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
747 if (mesa_buffer && !mpglAllocateMemoryMESA) { |
29680
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
748 mp_msg(MSGT_VO, MSGL_ERR, "Can not enable mesa-buffer because AllocateMemoryMESA was not found\n"); |
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
749 mesa_buffer = 0; |
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
750 } |
13843 | 751 initGl(vo_dwidth, vo_dheight); |
11542 | 752 |
35092 | 753 #ifdef CONFIG_GL_OSX |
754 vo_osx_redraw_func = osx_redraw; | |
755 #endif | |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
756 return 0; |
1 | 757 } |
758 | |
31 | 759 static void check_events(void) |
1 | 760 { |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
761 int e=glctx.check_events(); |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
762 if(e&VO_EVENT_REINIT) { |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
763 uninitGl(); |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
764 initGl(vo_dwidth, vo_dheight); |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
765 } |
31 | 766 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); |
35382
b85d632c3fe1
vo_gl: react to expose events even when not paused.
reimar
parents:
35097
diff
changeset
|
767 else if(e&VO_EVENT_EXPOSE) redraw(); |
31 | 768 } |
1 | 769 |
13585 | 770 /** |
771 * Creates the textures and the display list needed for displaying | |
772 * an OSD part. | |
773 * Callback function for vo_draw_text(). | |
774 */ | |
775 static void create_osd_texture(int x0, int y0, int w, int h, | |
776 unsigned char *src, unsigned char *srca, | |
777 int stride) | |
778 { | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
779 // 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
|
780 int sx = 8, sy = 8; |
28035 | 781 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
|
782 |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
783 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
|
784 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
|
785 return; |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
786 } |
16099 | 787 texSize(w, h, &sx, &sy); |
13585 | 788 |
789 if (osdtexCnt >= MAX_OSD_PARTS) { | |
790 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n"); | |
791 return; | |
792 } | |
793 | |
794 // create Textures for OSD part | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
795 mpglGenTextures(1, &osdtex[osdtexCnt]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
796 mpglBindTexture(gl_target, osdtex[osdtexCnt]); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
797 glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 798 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride, |
799 0, 0, w, h, 0); | |
13585 | 800 |
801 #ifndef FAST_OSD | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
802 mpglGenTextures(1, &osdatex[osdtexCnt]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
803 mpglBindTexture(gl_target, osdatex[osdtexCnt]); |
28002
bcb567424fbc
100l, OSD alpha textures were cleared to the wrong value.
reimar
parents:
27987
diff
changeset
|
804 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 805 { |
16221 | 806 int i; |
18878 | 807 char *tmp = malloc(stride * h); |
16272 | 808 // convert alpha from weird MPlayer scale. |
809 // 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
|
810 for (i = h * stride - 1; i >= 0; i--) |
25951 | 811 tmp[i] = -srca[i]; |
16117 | 812 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride, |
813 0, 0, w, h, 0); | |
814 free(tmp); | |
815 } | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
816 #endif |
13585 | 817 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
818 mpglBindTexture(gl_target, 0); |
13585 | 819 |
35011 | 820 osdcoords[osdtexCnt] = (struct osdcoords){x0, y0, w, h, sx, sy}; |
13585 | 821 |
822 osdtexCnt++; | |
823 } | |
824 | |
31809 | 825 #define RENDER_OSD 1 |
826 #define RENDER_EOSD 2 | |
827 | |
28803
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
828 /** |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
829 * \param type bit 0: render OSD, bit 1: render EOSD |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
830 */ |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
831 static void do_render_osd(int type) { |
35011 | 832 int i; |
31809 | 833 int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; |
834 int draw_eosd = (type & RENDER_EOSD) && eosdDispList; | |
31810 | 835 if (!draw_osd && !draw_eosd) |
836 return; | |
31811 | 837 // set special rendering parameters |
838 if (!scaled_osd) { | |
34337
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
839 // simple orthogonal projection for 0-vo_dwidth;0-vo_dheight |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
840 float matrix[16] = { |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
841 2.0/vo_dwidth, 0, 0, 0, |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
842 0, -2.0/vo_dheight, 0, 0, |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
843 0, 0, 0, 0, |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
844 -1, 1, 0, 1 |
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
845 }; |
31811 | 846 mpglMatrixMode(GL_PROJECTION); |
34337
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
847 mpglLoadMatrixf(matrix); |
31811 | 848 } |
849 mpglEnable(GL_BLEND); | |
850 if (draw_eosd) { | |
35445 | 851 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); |
31811 | 852 mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
853 mpglCallList(eosdDispList); | |
35445 | 854 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); |
31811 | 855 } |
856 if (draw_osd) { | |
35445 | 857 if (osd_color != 0xffffff) |
858 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | |
31811 | 859 mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); |
860 // draw OSD | |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
861 #ifndef FAST_OSD |
35011 | 862 // render alpha |
31811 | 863 mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); |
35011 | 864 for (i = 0; i < osdtexCnt; i++) { |
865 struct osdcoords *c = osdcoords + i; | |
866 mpglBindTexture(gl_target, osdatex[i]); | |
867 glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0); | |
868 } | |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
869 #endif |
35011 | 870 // render luminance OSD |
31811 | 871 mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); |
35011 | 872 for (i = 0; i < osdtexCnt; i++) { |
873 struct osdcoords *c = osdcoords + i; | |
874 mpglBindTexture(gl_target, osdtex[i]); | |
875 glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0); | |
876 } | |
35445 | 877 if (osd_color != 0xffffff) |
878 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | |
31811 | 879 } |
880 // set rendering parameters back to defaults | |
881 mpglDisable(GL_BLEND); | |
882 if (!scaled_osd) | |
36124 | 883 mpglLoadMatrixf(video_matrix); |
31811 | 884 mpglBindTexture(gl_target, 0); |
26840 | 885 } |
13585 | 886 |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
887 static void draw_osd(void) |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
888 { |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
889 if (!use_osd) return; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
890 if (vo_osd_changed(0)) { |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
891 int osd_h, osd_w; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
892 clearOSD(); |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
893 osd_w = scaled_osd ? image_width : vo_dwidth; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
894 osd_h = scaled_osd ? image_height : vo_dheight; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
895 vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
896 image_width, image_height, create_osd_texture); |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
897 } |
31809 | 898 if (vo_doublebuffering) do_render_osd(RENDER_OSD); |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
899 } |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
900 |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
901 static void do_render(void) { |
34061
fe03e0d5c7d0
Remove usage of glColor3f, there is not really a point in it.
reimar
parents:
33927
diff
changeset
|
902 mpglColor4f(1,1,1,1); |
36111 | 903 if (is_yuv || is_xyz || custom_prog) |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
904 glEnableYUVConversion(gl_target, yuvconvtype); |
31567 | 905 if (stereo_mode) { |
906 glEnable3DLeft(stereo_mode); | |
907 glDrawTex(0, 0, image_width, image_height, | |
908 0, 0, image_width >> 1, image_height, | |
909 texture_width, texture_height, | |
35005 | 910 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
911 mpi_flipped ^ vo_flipped, stereo_mode == GL_3D_STIPPLE); |
31567 | 912 glEnable3DRight(stereo_mode); |
913 glDrawTex(0, 0, image_width, image_height, | |
914 image_width >> 1, 0, image_width >> 1, image_height, | |
915 texture_width, texture_height, | |
35005 | 916 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
917 mpi_flipped ^ vo_flipped, stereo_mode == GL_3D_STIPPLE); |
31567 | 918 glDisable3D(stereo_mode); |
919 } else { | |
31573 | 920 glDrawTex(0, 0, image_width, image_height, |
921 0, 0, image_width, image_height, | |
922 texture_width, texture_height, | |
35005 | 923 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
924 mpi_flipped ^ vo_flipped, 0); |
31567 | 925 } |
36111 | 926 if (is_yuv || is_xyz || custom_prog) |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
927 glDisableYUVConversion(gl_target, yuvconvtype); |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
928 did_render = 1; |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
929 } |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
930 |
26840 | 931 static void flip_page(void) { |
35616 | 932 int need_clear = aspect_scaling() && use_aspect; |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
933 // We might get an expose event between draw_image and its |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
934 // corresponding flip_page. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
935 // For double-buffering we would then flip in a clear backbuffer. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
936 // Easiest way to handle it is by keeping track if the |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
937 // current GL buffer contains a properly rendered video. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
938 // did_render will always be false for single buffer. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
939 if (!did_render) { |
35616 | 940 if (!vo_doublebuffering && need_clear) |
941 mpglClear(GL_COLOR_BUFFER_BIT); | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
942 do_render(); |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
943 do_render_osd(RENDER_OSD | RENDER_EOSD); |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
944 } |
35616 | 945 if (use_glFinish) mpglFinish(); |
946 | |
26841
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
947 if (vo_doublebuffering) { |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
948 glctx.swapGlBuffers(&glctx); |
35616 | 949 if (need_clear) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
950 mpglClear(GL_COLOR_BUFFER_BIT); |
35616 | 951 } else if (!use_glFinish) |
952 mpglFlush(); | |
953 | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
954 did_render = 0; |
1 | 955 } |
956 | |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
957 static void redraw(void) { |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
958 flip_page(); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
959 } |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
960 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
961 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
1 | 962 { |
28035 | 963 mpi_flipped = stride[0] < 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
964 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
|
965 x, y, w, h, slice_height); |
30097 | 966 if (is_yuv) { |
967 int xs, ys; | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
968 mp_get_chroma_shift(image_format, &xs, &ys, NULL); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
969 mpglActiveTexture(GL_TEXTURE1); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
970 glUploadTex(gl_target, gl_format, gl_type, src[1], stride[1], |
30097 | 971 x >> xs, y >> ys, w >> xs, h >> ys, slice_height); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
972 mpglActiveTexture(GL_TEXTURE2); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
973 glUploadTex(gl_target, gl_format, gl_type, src[2], stride[2], |
30097 | 974 x >> xs, y >> ys, w >> xs, h >> ys, slice_height); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
975 mpglActiveTexture(GL_TEXTURE0); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
976 } |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
977 return 0; |
1 | 978 } |
979 | |
16099 | 980 static uint32_t get_image(mp_image_t *mpi) { |
28065 | 981 int needed_size; |
34819 | 982 dr_rejectcnt++; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
983 if (!mpglGenBuffers || !mpglBindBuffer || !mpglBufferData || !mpglMapBuffer) { |
16099 | 984 if (!err_shown) |
985 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n" | |
986 "Expect a _major_ speed penalty\n"); | |
16113 | 987 err_shown = 1; |
16099 | 988 return VO_FALSE; |
989 } | |
34862
e28caa1840a0
Do not give out the same buffer to multiple mp_images.
reimar
parents:
34845
diff
changeset
|
990 if (gl_bufferptr) return VO_FALSE; |
16099 | 991 if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; |
28939
cbf56e4c9662
Check mpi type before returning an DR buffer in get_image, fixes jerkiness
reimar
parents:
28828
diff
changeset
|
992 if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP && |
34862
e28caa1840a0
Do not give out the same buffer to multiple mp_images.
reimar
parents:
34845
diff
changeset
|
993 mpi->type != MP_IMGTYPE_IPB && |
e28caa1840a0
Do not give out the same buffer to multiple mp_images.
reimar
parents:
34845
diff
changeset
|
994 mpi->type != MP_IMGTYPE_NUMBERED) |
28939
cbf56e4c9662
Check mpi type before returning an DR buffer in get_image, fixes jerkiness
reimar
parents:
28828
diff
changeset
|
995 return VO_FALSE; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
996 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
|
997 else if (ati_hack) { |
27874
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
998 mpi->width = texture_width; |
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
999 mpi->height = texture_height; |
27169
78d837adc71e
100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents:
27168
diff
changeset
|
1000 } |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1001 mpi->stride[0] = mpi->width * mpi->bpp / 8; |
34810 | 1002 needed_size = mpi->stride[0] * mpi->height + 31; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1003 if (mesa_buffer) { |
30023 | 1004 #ifdef CONFIG_GL_X11 |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1005 if (mesa_bufferptr && needed_size > mesa_buffersize) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1006 mpglFreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1007 mesa_bufferptr = NULL; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1008 } |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1009 if (!mesa_bufferptr) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1010 mesa_bufferptr = mpglAllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 1.0, 1.0); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1011 mesa_buffersize = needed_size; |
29648
74f94f407c31
Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents:
29646
diff
changeset
|
1012 #endif |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1013 mpi->planes[0] = mesa_bufferptr; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1014 } else { |
28068 | 1015 if (!gl_buffer) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1016 mpglGenBuffers(1, &gl_buffer); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1017 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); |
28068 | 1018 if (needed_size > gl_buffersize) { |
1019 gl_buffersize = needed_size; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1020 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1021 NULL, GL_DYNAMIC_DRAW); |
28068 | 1022 } |
1023 if (!gl_bufferptr) | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1024 gl_bufferptr = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
34810 | 1025 mpi->priv = gl_bufferptr; |
1026 mpi->planes[0] = (uint8_t *)gl_bufferptr + (-(intptr_t)gl_bufferptr & 31); | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1027 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1028 } |
28035 | 1029 if (!mpi->planes[0]) { |
16113 | 1030 if (!err_shown) |
25754 | 1031 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n" |
16113 | 1032 "Expect a _major_ speed penalty\n"); |
1033 err_shown = 1; | |
1034 return VO_FALSE; | |
1035 } | |
30097 | 1036 if (is_yuv) { |
1037 // planar YUV | |
1038 int xs, ys; | |
34723 | 1039 int bpp; |
1040 mp_get_chroma_shift(image_format, &xs, &ys, &bpp); | |
1041 bpp = (bpp + 7) / 8; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1042 mpi->flags |= MP_IMGFLAG_COMMON_STRIDE | MP_IMGFLAG_COMMON_PLANE; |
34723 | 1043 mpi->stride[0] = mpi->width * bpp; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1044 mpi->planes[1] = mpi->planes[0] + mpi->stride[0] * mpi->height; |
34723 | 1045 mpi->stride[1] = (mpi->width >> xs) * bpp; |
30097 | 1046 mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> ys); |
34723 | 1047 mpi->stride[2] = mpi->stride[1]; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
1048 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
|
1049 mpi->flags &= ~MP_IMGFLAG_COMMON_PLANE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1050 if (!gl_buffer_uv[0]) mpglGenBuffers(2, gl_buffer_uv); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1051 if (mpi->stride[1] * mpi->height > gl_buffersize_uv) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1052 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1053 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1054 NULL, GL_DYNAMIC_DRAW); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1055 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1056 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1057 NULL, GL_DYNAMIC_DRAW); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1058 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
|
1059 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1060 if (!gl_bufferptr_uv[0]) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1061 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1062 gl_bufferptr_uv[0] = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1063 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1064 gl_bufferptr_uv[1] = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1065 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1066 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
|
1067 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
|
1068 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1069 } |
16099 | 1070 mpi->flags |= MP_IMGFLAG_DIRECT; |
34819 | 1071 dr_rejectcnt--; |
16099 | 1072 return VO_TRUE; |
1073 } | |
1074 | |
28164 | 1075 static void clear_border(uint8_t *dst, int start, int stride, int height, int full_height, int value) { |
1076 int right_border = stride - start; | |
1077 int bottom_border = full_height - height; | |
1078 while (height > 0) { | |
1079 memset(dst + start, value, right_border); | |
1080 dst += stride; | |
1081 height--; | |
1082 } | |
1083 if (bottom_border > 0) | |
1084 memset(dst, value, stride * bottom_border); | |
1085 } | |
1086 | |
16092 | 1087 static uint32_t draw_image(mp_image_t *mpi) { |
35005 | 1088 // Ask for TexImage instead of TexSubImage for the rectangle + YCBCR + nodr special case. |
1089 int slice = gl_target == GL_TEXTURE_RECTANGLE && gl_format == GL_YCBCR_422_APPLE ? -1 : slice_height; | |
26681 | 1090 int stride[3]; |
1091 unsigned char *planes[3]; | |
1092 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
|
1093 int w = mpi->w, h = mpi->h; |
34819 | 1094 imgcnt++; |
16092 | 1095 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
|
1096 goto skip_upload; |
34819 | 1097 dr_imgcnt += !!(mpi->flags & MP_IMGFLAG_DIRECT); |
26681 | 1098 mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; |
1099 mpi2.width = mpi2.w; mpi2.height = mpi2.h; | |
1100 if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) { | |
34723 | 1101 int bpp; |
1102 int line_bytes, line_bytes_c; | |
30097 | 1103 int xs, ys; |
34723 | 1104 mp_get_chroma_shift(image_format, &xs, &ys, &bpp); |
1105 bpp = is_yuv ? (bpp + 7) & ~7 : mpi->bpp; | |
1106 line_bytes = mpi->w * bpp / 8; | |
1107 line_bytes_c = (mpi->w >> xs) * bpp / 8; | |
1108 memcpy_pic(mpi2.planes[0], mpi->planes[0], line_bytes, mpi->h, mpi2.stride[0], mpi->stride[0]); | |
30097 | 1109 if (is_yuv) { |
34723 | 1110 memcpy_pic(mpi2.planes[1], mpi->planes[1], line_bytes_c, mpi->h >> ys, mpi2.stride[1], mpi->stride[1]); |
1111 memcpy_pic(mpi2.planes[2], mpi->planes[2], line_bytes_c, mpi->h >> ys, mpi2.stride[2], mpi->stride[2]); | |
26681 | 1112 } |
28164 | 1113 if (ati_hack) { // since we have to do a full upload we need to clear the borders |
34723 | 1114 clear_border(mpi2.planes[0], line_bytes, mpi2.stride[0], mpi->h, mpi2.height, 0); |
30097 | 1115 if (is_yuv) { |
34723 | 1116 clear_border(mpi2.planes[1], line_bytes_c, mpi2.stride[1], mpi->h >> ys, mpi2.height >> ys, 128); |
1117 clear_border(mpi2.planes[2], line_bytes_c, mpi2.stride[2], mpi->h >> ys, mpi2.height >> ys, 128); | |
28164 | 1118 } |
1119 } | |
26681 | 1120 mpi = &mpi2; |
1121 } | |
1122 stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2]; | |
1123 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; | |
28035 | 1124 mpi_flipped = stride[0] < 0; |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1125 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
28073 | 1126 if (mesa_buffer) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1127 mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); |
28073 | 1128 w = texture_width; |
1129 } else { | |
34810 | 1130 intptr_t base = (intptr_t)mpi->priv; |
28072 | 1131 if (ati_hack) { w = texture_width; h = texture_height; } |
28071 | 1132 if (mpi_flipped) |
1133 base += (mpi->h - 1) * stride[0]; | |
1134 planes[0] -= base; | |
1135 planes[1] -= base; | |
1136 planes[2] -= base; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1137 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1138 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
28071 | 1139 gl_bufferptr = NULL; |
1140 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) | |
1141 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
|
1142 } |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1143 slice = 0; // always "upload" full texture |
16099 | 1144 } |
18995 | 1145 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
|
1146 mpi->x, mpi->y, w, h, slice); |
30097 | 1147 if (is_yuv) { |
1148 int xs, ys; | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1149 mp_get_chroma_shift(image_format, &xs, &ys, NULL); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1150 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1151 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1152 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1153 gl_bufferptr_uv[0] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1154 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1155 mpglActiveTexture(GL_TEXTURE1); |
18995 | 1156 glUploadTex(gl_target, gl_format, gl_type, planes[1], stride[1], |
30097 | 1157 mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys, slice); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1158 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1159 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1160 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1161 gl_bufferptr_uv[1] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1162 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1163 mpglActiveTexture(GL_TEXTURE2); |
18995 | 1164 glUploadTex(gl_target, gl_format, gl_type, planes[2], stride[2], |
30097 | 1165 mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys, slice); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1166 mpglActiveTexture(GL_TEXTURE0); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1167 } |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1168 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1169 if (mesa_buffer) mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 0); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1170 else mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1171 } |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
1172 skip_upload: |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
1173 if (vo_doublebuffering) do_render(); |
16092 | 1174 return VO_TRUE; |
1175 } | |
1 | 1176 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
1177 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
|
1178 draw_frame(uint8_t *src[]) |
1 | 1179 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
1180 return VO_ERROR; |
1 | 1181 } |
1182 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
1183 static int |
1 | 1184 query_format(uint32_t format) |
1185 { | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1186 int depth; |
16092 | 1187 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | |
18996 | 1188 VFCAP_FLIP | |
35889 | 1189 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; |
1190 // TODO: This assumes backend auto-detection was run | |
1191 // before this code. | |
1192 // In addition strides might not work with X11 GLES either. | |
1193 if (glctx.type != GLTYPE_EGL_ANDROID) | |
1194 caps |= VFCAP_ACCEPT_STRIDE; | |
13585 | 1195 if (use_osd) |
23135
960434b7d963
Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd
reimar
parents:
23134
diff
changeset
|
1196 caps |= VFCAP_OSD | VFCAP_EOSD | (scaled_osd ? 0 : VFCAP_EOSD_UNSCALED); |
28035 | 1197 if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA) |
13585 | 1198 return caps; |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1199 if (use_yuv && mp_get_chroma_shift(format, NULL, NULL, &depth) && |
33414 | 1200 (depth == 8 || depth == 16 || glYUVLargeRange(use_yuv)) && |
30110 | 1201 (IMGFMT_IS_YUVP16_NE(format) || !IMGFMT_IS_YUVP16(format))) |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1202 return caps; |
36111 | 1203 if ((MASK_NOT_COMBINERS & (1 << use_yuv)) && IMGFMT_IS_XYZ(format)) |
1204 return caps; | |
19356
595ac8077dc5
Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents:
18996
diff
changeset
|
1205 // 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
|
1206 // 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
|
1207 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
|
1208 return 0; |
35005 | 1209 if (!use_ycbcr && (format == IMGFMT_YUY2 || format == IMGFMT_UYVY)) |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
1210 return 0; |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
1211 if (many_fmts && |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
1212 glFindFormat(format, NULL, NULL, NULL, NULL)) |
13585 | 1213 return caps; |
1 | 1214 return 0; |
1215 } | |
1216 | |
1217 | |
1218 static void | |
1219 uninit(void) | |
1220 { | |
16433 | 1221 uninitGl(); |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32533
diff
changeset
|
1222 free(custom_prog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1223 custom_prog = NULL; |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32533
diff
changeset
|
1224 free(custom_tex); |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1225 custom_tex = NULL; |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1226 uninit_mpglcontext(&glctx); |
1 | 1227 } |
4352 | 1228 |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1229 static int valid_backend(void *p) |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1230 { |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1231 int *backend = p; |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1232 return *backend >= GLTYPE_AUTO && *backend < GLTYPE_COUNT; |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1233 } |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1234 |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1235 static int valid_csp(void *p) |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1236 { |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1237 int *csp = p; |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1238 return *csp >= -1 && *csp < MP_CSP_COUNT; |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1239 } |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1240 |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1241 static int valid_csp_lvl(void *p) |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1242 { |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1243 int *lvl = p; |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1244 return *lvl >= -1 && *lvl < MP_CSP_LEVELCONV_COUNT; |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1245 } |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1246 |
28828
56eee6ffba9b
Make data related to suboption parsing const in libvo
reimar
parents:
28814
diff
changeset
|
1247 static const opt_t subopts[] = { |
14286 | 1248 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL}, |
1249 {"osd", OPT_ARG_BOOL, &use_osd, NULL}, | |
1250 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL}, | |
1251 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL}, | |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
1252 {"ycbcr", OPT_ARG_BOOL, &use_ycbcr, NULL}, |
30122
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1253 {"slice-height", OPT_ARG_INT, &slice_height, int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1254 {"rectangle", OPT_ARG_INT, &use_rectangle,int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1255 {"yuv", OPT_ARG_INT, &use_yuv, int_non_neg}, |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1256 {"colorspace", OPT_ARG_INT, &colorspace, valid_csp}, |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1257 {"levelconv", OPT_ARG_INT, &levelconv, valid_csp_lvl}, |
30122
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1258 {"lscale", OPT_ARG_INT, &lscale, int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1259 {"cscale", OPT_ARG_INT, &cscale, int_non_neg}, |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
1260 {"filter-strength", OPT_ARG_FLOAT, &filter_strength, NULL}, |
33927 | 1261 {"noise-strength", OPT_ARG_FLOAT, &noise_strength, NULL}, |
26677
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
1262 {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL}, |
26681 | 1263 {"force-pbo", OPT_ARG_BOOL, &force_pbo, NULL}, |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1264 {"mesa-buffer", OPT_ARG_BOOL, &mesa_buffer, NULL}, |
16235 | 1265 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, |
16268 | 1266 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL}, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1267 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL}, |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1268 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL}, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1269 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL}, |
18963 | 1270 {"customtrect", OPT_ARG_BOOL, &custom_trect, NULL}, |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1271 {"mipmapgen", OPT_ARG_BOOL, &mipmap_gen, 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
|
1272 {"osdcolor", OPT_ARG_INT, &osd_color, NULL}, |
31567 | 1273 {"stereo", OPT_ARG_INT, &stereo_mode, NULL}, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1274 {"stipple", OPT_ARG_INT, &stipple, NULL}, |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1275 {"backend", OPT_ARG_INT, &backend, valid_backend}, |
14286 | 1276 {NULL} |
1277 }; | |
1278 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1279 static int preinit_internal(const char *arg, int allow_sw) |
4352 | 1280 { |
14286 | 1281 // set defaults |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1282 backend = GLTYPE_AUTO; |
16012 | 1283 many_fmts = 1; |
31023
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
1284 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
|
1285 scaled_osd = 0; |
13601 | 1286 use_aspect = 1; |
35008 | 1287 use_ycbcr = -1; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1288 use_yuv = -1; |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1289 colorspace = -1; |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1290 levelconv = -1; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
1291 lscale = 0; |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
1292 cscale = 0; |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
1293 filter_strength = 0.5; |
33927 | 1294 noise_strength = 0.0; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1295 use_rectangle = -1; |
16235 | 1296 use_glFinish = 0; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1297 ati_hack = -1; |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1298 force_pbo = -1; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1299 mesa_buffer = 0; |
16268 | 1300 swap_interval = 1; |
23878
e64c59f73527
Set -vo gl slice-height default to 0, the current default of 4 seems
reimar
parents:
23655
diff
changeset
|
1301 slice_height = 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1302 custom_prog = NULL; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1303 custom_tex = NULL; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1304 custom_tlin = 1; |
18963 | 1305 custom_trect = 0; |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1306 mipmap_gen = 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
|
1307 osd_color = 0xffffff; |
31567 | 1308 stereo_mode = 0; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1309 stipple = 0x0f0f; |
14286 | 1310 if (subopt_parse(arg, subopts) != 0) { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
1311 mp_msg(MSGT_VO, MSGL_FATAL, |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1312 "\n-vo gl command line help:\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1313 "Example: mplayer -vo gl:slice-height=4\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1314 "\nOptions:\n" |
22087 | 1315 " nomanyfmts\n" |
1316 " 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
|
1317 " slice-height=<0-...>\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1318 " Slice size for texture transfer, 0 for whole image\n" |
13585 | 1319 " noosd\n" |
1320 " Do not use OpenGL OSD code\n" | |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1321 " scaled-osd\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1322 " Render OSD at movie resolution and scale it\n" |
13601 | 1323 " noaspect\n" |
1324 " Do not do aspect scaling\n" | |
16099 | 1325 " rectangle=<0,1,2>\n" |
1326 " 0: use power-of-two textures\n" | |
1327 " 1: use texture_rectangle\n" | |
1328 " 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
|
1329 " ati-hack\n" |
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
1330 " Workaround ATI bug with PBOs\n" |
26681 | 1331 " force-pbo\n" |
1332 " Force use of PBO even if this involves an extra memcpy\n" | |
16235 | 1333 " glfinish\n" |
1334 " Call glFinish() before swapping buffers\n" | |
16268 | 1335 " swapinterval=<n>\n" |
1336 " Interval in displayed frames between to buffer swaps.\n" | |
1337 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n" | |
1338 " Requires GLX_SGI_swap_control support to work.\n" | |
30033 | 1339 " ycbcr\n" |
35006 | 1340 " also try to use the GL_APPLE_ycbcr_422 extension\n" |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1341 " yuv=<n>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1342 " 0: use software YUV to RGB conversion.\n" |
16626 | 1343 " 1: use register combiners (nVidia only, for older cards).\n" |
36105
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
1344 " 2: use fragment program with gamma correction.\n" |
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
1345 " 3: same as 2.\n" |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1346 " 4: use fragment program with gamma correction via lookup.\n" |
16626 | 1347 " 5: use ATI-specific method (for older cards).\n" |
22087 | 1348 " 6: use lookup via 3D texture.\n" |
35007 | 1349 " colorspace=<n>\n" |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1350 " 0: MPlayer's default YUV to RGB conversion\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1351 " 1: YUV to RGB according to BT.601\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1352 " 2: YUV to RGB according to BT.709\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1353 " 3: YUV to RGB according to SMPT-240M\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1354 " 4: YUV to RGB according to EBU\n" |
30121
28cbec606cbb
Slightly generalize code to generate YUV->RGB conversion table and add
reimar
parents:
30119
diff
changeset
|
1355 " 5: XYZ to RGB\n" |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1356 " levelconv=<n>\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1357 " 0: YUV to RGB converting TV to PC levels\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1358 " 1: YUV to RGB converting PC to TV levels\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1359 " 2: YUV to RGB without converting levels\n" |
18695 | 1360 " lscale=<n>\n" |
1361 " 0: use standard bilinear scaling for luma.\n" | |
1362 " 1: use improved bicubic scaling for luma.\n" | |
22489 | 1363 " 2: use cubic in X, linear in Y direction scaling for luma.\n" |
25728 | 1364 " 3: as 1 but without using a lookup texture.\n" |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1365 " 4: experimental unsharp masking (sharpening).\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1366 " 5: experimental unsharp masking (sharpening) with larger radius.\n" |
18695 | 1367 " cscale=<n>\n" |
1368 " 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
|
1369 " filter-strength=<value>\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1370 " set the effect strength for some lscale/cscale filters\n" |
33927 | 1371 " noise-strength=<value>\n" |
1372 " set how much noise to add. 1.0 is suitable for dithering to 6 bit.\n" | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1373 " customprog=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1374 " use a custom YUV conversion program\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1375 " customtex=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1376 " 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
|
1377 " nocustomtlin\n" |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1378 " use GL_NEAREST scaling for customtex texture\n" |
18963 | 1379 " customtrect\n" |
1380 " use texture_rectangle for customtex texture\n" | |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1381 " mipmapgen\n" |
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1382 " generate mipmaps for the video image (use with TXB in customprog)\n" |
25952 | 1383 " 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
|
1384 " use the given color for the OSD\n" |
34375 | 1385 " stereo=<n> (add 32 to swap left and right)\n" |
31567 | 1386 " 0: normal display\n" |
1387 " 1: side-by-side to red-cyan stereo\n" | |
1388 " 2: side-by-side to green-magenta stereo\n" | |
31581
8f8c92592747
Independent tests indicate that GLX_STEREO is working fine on supported hardware.
cehoyos
parents:
31573
diff
changeset
|
1389 " 3: side-by-side to quadbuffer stereo\n" |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1390 " 4: side-by-side to pixel pattern\n" |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1391 " stipple=<0xBBBB>\n" |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1392 " 16 bits representing 4x4 pattern to use for stereo=4\n" |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1393 " backend=<n>\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1394 " -1: auto-select\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1395 " 0: Win32/WGL\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1396 " 1: X11/GLX\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1397 " 2: SDL\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1398 " 3: X11/EGL (experimental)\n" |
35097 | 1399 " 4: OSX/Cocoa\n" |
36119 | 1400 " 5: Android (experimental)\n" |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1401 "\n" ); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1402 return -1; |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1403 } |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1404 if (!init_mpglcontext(&glctx, backend)) |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1405 goto err_out; |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1406 if (use_yuv == -1 || !allow_sw) { |
30465
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30447
diff
changeset
|
1407 if (create_window(320, 200, VOFLAG_HIDDEN, NULL) < 0) |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1408 goto err_out; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1409 if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1410 goto err_out; |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1411 if (!allow_sw && isSoftwareGl()) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1412 goto err_out; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1413 autodetectGlExtensions(); |
35008 | 1414 } else if (use_ycbcr == -1) { |
1415 // rare feature, not worth creating a window to detect | |
1416 use_ycbcr = 0; | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1417 } |
30468
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1418 if (many_fmts) |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1419 mp_msg(MSGT_VO, MSGL_INFO, "[gl] using extended formats. " |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1420 "Use -vo gl:nomanyfmts if playback fails.\n"); |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1421 mp_msg(MSGT_VO, MSGL_V, "[gl] Using %d as slice height " |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1422 "(0 means image height).\n", slice_height); |
34819 | 1423 imgcnt = dr_imgcnt = dr_rejectcnt = 0; |
7777 | 1424 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1425 return 0; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1426 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1427 err_out: |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1428 uninit(); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1429 return -1; |
4352 | 1430 } |
1431 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1432 static int preinit(const char *arg) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1433 { |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1434 return preinit_internal(arg, 1); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1435 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1436 |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1437 static int preinit_nosw(const char *arg) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1438 { |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1439 return preinit_internal(arg, 0); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1440 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1441 |
26822 | 1442 static const struct { |
1443 const char *name; | |
1444 int *value; | |
1445 int supportmask; | |
1446 } eq_map[] = { | |
1447 {"brightness", &eq_bri, MASK_NOT_COMBINERS}, | |
1448 {"contrast", &eq_cont, MASK_NOT_COMBINERS}, | |
1449 {"saturation", &eq_sat, MASK_ALL_YUV }, | |
1450 {"hue", &eq_hue, MASK_ALL_YUV }, | |
1451 {"gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1452 {"red_gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1453 {"green_gamma", &eq_ggamma, MASK_GAMMA_SUPPORT}, | |
1454 {"blue_gamma", &eq_bgamma, MASK_GAMMA_SUPPORT}, | |
1455 {NULL, NULL, 0 } | |
1456 }; | |
1457 | |
33305
ddb45e9443ec
Remove the variable arguments from the libvo control() functions.
iive
parents:
33301
diff
changeset
|
1458 static int control(uint32_t request, void *data) |
4352 | 1459 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1460 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1461 case VOCTRL_QUERY_FORMAT: |
28035 | 1462 return query_format(*(uint32_t*)data); |
16099 | 1463 case VOCTRL_GET_IMAGE: |
1464 return get_image(data); | |
16092 | 1465 case VOCTRL_DRAW_IMAGE: |
1466 return draw_image(data); | |
19578 | 1467 case VOCTRL_DRAW_EOSD: |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1468 if (!data) |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1469 return VO_FALSE; |
19578 | 1470 genEOSD(data); |
31809 | 1471 if (vo_doublebuffering) do_render_osd(RENDER_EOSD); |
19578 | 1472 return VO_TRUE; |
1473 case VOCTRL_GET_EOSD_RES: | |
1474 { | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
1475 struct mp_eosd_settings *r = data; |
29521
f17b515cb326
Simplify -vo gl ass border etc. dimension calculation one bit more.
reimar
parents:
29519
diff
changeset
|
1476 r->w = vo_dwidth; r->h = vo_dheight; |
30065
d5d20b8256b7
Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents:
30063
diff
changeset
|
1477 r->srcw = image_width; r->srch = image_height; |
19578 | 1478 r->mt = r->mb = r->ml = r->mr = 0; |
1479 if (scaled_osd) {r->w = image_width; r->h = image_height;} | |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
1480 else if (aspect_scaling()) { |
24787
02535b3216c5
Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents:
23987
diff
changeset
|
1481 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
|
1482 r->mt = r->mb = ass_border_y; |
19578 | 1483 } |
1484 } | |
1485 return VO_TRUE; | |
13843 | 1486 case VOCTRL_GUISUPPORT: |
1487 return VO_TRUE; | |
11542 | 1488 case VOCTRL_ONTOP: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1489 glctx.ontop(); |
11542 | 1490 return VO_TRUE; |
6095 | 1491 case VOCTRL_FULLSCREEN: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1492 glctx.fullscreen(); |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
1493 resize(vo_dwidth, vo_dheight); |
6095 | 1494 return VO_TRUE; |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1495 case VOCTRL_BORDER: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1496 glctx.border(); |
25912 | 1497 resize(vo_dwidth, vo_dheight); |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1498 return VO_TRUE; |
13601 | 1499 case VOCTRL_GET_PANSCAN: |
1500 if (!use_aspect) return VO_NOTIMPL; | |
1501 return VO_TRUE; | |
1502 case VOCTRL_SET_PANSCAN: | |
1503 if (!use_aspect) return VO_NOTIMPL; | |
28035 | 1504 resize(vo_dwidth, vo_dheight); |
13601 | 1505 return VO_TRUE; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1506 case VOCTRL_GET_EQUALIZER: |
30097 | 1507 if (is_yuv) { |
26822 | 1508 int i; |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1509 vf_equalizer_t *eq=data; |
26822 | 1510 for (i = 0; eq_map[i].name; i++) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1511 if (strcmp(eq->item, eq_map[i].name) == 0) break; |
26822 | 1512 if (!(eq_map[i].supportmask & (1 << use_yuv))) |
1513 break; | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1514 eq->value = *eq_map[i].value; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1515 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1516 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1517 break; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1518 case VOCTRL_SET_EQUALIZER: |
30097 | 1519 if (is_yuv) { |
26822 | 1520 int i; |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1521 vf_equalizer_t *eq=data; |
26822 | 1522 for (i = 0; eq_map[i].name; i++) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1523 if (strcmp(eq->item, eq_map[i].name) == 0) break; |
26822 | 1524 if (!(eq_map[i].supportmask & (1 << use_yuv))) |
1525 break; | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1526 *eq_map[i].value = eq->value; |
35830 | 1527 if (strcmp(eq->item, "gamma") == 0) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1528 eq_rgamma = eq_ggamma = eq_bgamma = eq->value; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1529 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1530 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1531 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1532 break; |
22232 | 1533 case VOCTRL_UPDATE_SCREENINFO: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1534 glctx.update_xinerama_info(); |
22232 | 1535 return VO_TRUE; |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1536 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1537 return VO_NOTIMPL; |
4352 | 1538 } |