annotate libvo/vo_gl.c @ 35928:67c0f68b3370

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