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