annotate libvo/vo_gl.c @ 30446:f77e32f1ecc0

Avoid using options before autodetectGlExtensions to allow it to change them properly.
author reimar
date Tue, 02 Feb 2010 20:20:48 +0000
parents 72e1e6824499
children c84c27c3eafb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
1 /*
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
2 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
5 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
7 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
8 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
12 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
13 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
14 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
17 */
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28424
diff changeset
18
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
22 #include <math.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
24 #include "config.h"
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
25 #include "mp_msg.h"
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
26 #include "subopt-helper.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 #include "video_out_internal.h"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
29 #include "font_load.h"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
30 #include "sub.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
32 #include "gl_common.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2041
diff changeset
33 #include "aspect.h"
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27306
diff changeset
34 #ifdef CONFIG_GUI
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22489
diff changeset
35 #include "gui/interface.h"
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
36 #endif
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
37 #include "fastmemcpy.h"
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
38 #include "libass/ass_mp.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
39
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28939
diff changeset
40 static const vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
42 "X11 (OpenGL)",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
43 "gl",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
44 "Arpad Gereoffy <arpi@esp-team.scene.hu>",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
45 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
48 const LIBVO_EXTERN(gl)
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
49
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
50 #ifdef CONFIG_GL_X11
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
51 static int wsGLXAttrib[] = { GLX_RGBA,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 GLX_RED_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 GLX_GREEN_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 GLX_BLUE_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 GLX_DOUBLEBUFFER,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 None };
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
57 #endif
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
58 static MPGLContext glctx;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
60 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
61 static int scaled_osd;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
62 //! How many parts the OSD may consist of at most
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
63 #define MAX_OSD_PARTS 20
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
64 //! Textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
65 static GLuint osdtex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
66 #ifndef FAST_OSD
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
67 //! Alpha textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
68 static GLuint osdatex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
69 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
70 static GLuint *eosdtex;
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
71 #define LARGE_EOSD_TEX_SIZE 512
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
72 #define TINYTEX_SIZE 16
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
73 #define TINYTEX_COLS (LARGE_EOSD_TEX_SIZE/TINYTEX_SIZE)
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
74 #define TINYTEX_MAX (TINYTEX_COLS*TINYTEX_COLS)
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
75 #define SMALLTEX_SIZE 32
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
76 #define SMALLTEX_COLS (LARGE_EOSD_TEX_SIZE/SMALLTEX_SIZE)
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
77 #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
78 static GLuint largeeosdtex[2];
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
79 //! Display lists that draw the OSD parts
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
80 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
81 #ifndef FAST_OSD
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
82 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
83 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
84 static GLuint eosdDispList;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
85 //! How many parts the OSD currently consists of
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
86 static int osdtexCnt;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
87 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
88 static int osd_color;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
90 static int use_aspect;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
91 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
92 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE))
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
93 #define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI)))
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
94 #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
95 static int use_yuv;
30119
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
96 static int colorspace;
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
97 static int levelconv;
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
98 static int is_yuv;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
99 static int lscale;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
100 static int cscale;
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
101 static float filter_strength;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
102 static int yuvconvtype;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
103 static int use_rectangle;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
104 static int err_shown;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 static uint32_t image_height;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
107 static uint32_t image_format;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
108 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
109 static int ati_hack;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
110 static int force_pbo;
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
111 static int mesa_buffer;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
112 static int use_glFinish;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
113 static int swap_interval;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
114 static GLenum gl_target;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16282
diff changeset
115 static GLint gl_texfmt;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
116 static GLenum gl_format;
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
117 static GLenum gl_type;
16434
db8d8039a5f4 gl_buffer should be unsigned
reimar
parents: 16433
diff changeset
118 static GLuint gl_buffer;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
119 static GLuint gl_buffer_uv[2];
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
120 static int gl_buffersize;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
121 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
122 static void *gl_bufferptr;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
123 static void *gl_bufferptr_uv[2];
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
124 static int mesa_buffersize;
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
125 static void *mesa_bufferptr;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
126 static GLuint fragprog;
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
127 static GLuint default_texs[22];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
128 static char *custom_prog;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
129 static char *custom_tex;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
130 static int custom_tlin;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
131 static int custom_trect;
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
132 static int mipmap_gen;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
134 static int int_pause;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
135 static int eq_bri = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
136 static int eq_cont = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
137 static int eq_sat = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
138 static int eq_hue = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
139 static int eq_rgamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
140 static int eq_ggamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
141 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
142
16879
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
143 static int texture_width;
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
144 static int texture_height;
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
145 static int mpi_flipped;
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
146 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
147 static int ass_border_x, ass_border_y;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
149 static unsigned int slice_height = 1;
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
150
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
151 static void redraw(void);
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
152
612
77e0094f0cce some warnings killed
szabii
parents: 384
diff changeset
153 static void resize(int x,int y){
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
154 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
155 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
156 int top = 0, left = 0, w = x, h = y;
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
157 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight);
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
158 Viewport(top, left, w, h);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
159 } else
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
160 Viewport( 0, 0, x, y );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
162 MatrixMode(GL_PROJECTION);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
163 LoadIdentity();
28590
d1ca19ff9b52 100l, reset ass_border when switching out of fullscreen mode.
reimar
parents: 28446
diff changeset
164 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
165 if (aspect_scaling() && use_aspect) {
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
166 int new_w, new_h;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
167 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
168 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
169 panscan_calc_windowed();
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
170 new_w += vo_panscan_x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
171 new_h += vo_panscan_y;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
172 scale_x = (GLdouble)new_w / (GLdouble)x;
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
173 scale_y = (GLdouble)new_h / (GLdouble)y;
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
174 Scaled(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
175 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
176 ass_border_y = (vo_dheight - new_h) / 2;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
177 }
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
178 Ortho(0, image_width, image_height, 0, -1,1);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
180 MatrixMode(GL_MODELVIEW);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
181 LoadIdentity();
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
182
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
183 if (!scaled_osd) {
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27343
diff changeset
184 #ifdef CONFIG_FREETYPE
15086
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
185 // adjust font size to display size
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
186 force_load_font = 1;
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
187 #endif
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
188 vo_osd_changed(OSDTYPE_OSD);
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
189 }
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
190 Clear(GL_COLOR_BUFFER_BIT);
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
191 redraw();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
192 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
193
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
194 static void texSize(int w, int h, int *texw, int *texh) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
195 if (use_rectangle) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
196 *texw = w; *texh = h;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
197 } else {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
198 *texw = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
199 while (*texw < w)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
200 *texw *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
201 *texh = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
202 while (*texh < h)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
203 *texh *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
204 }
28073
fa17a5971df6 More possible fixes for mesa-buffer mode.
reimar
parents: 28072
diff changeset
205 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
206 else if (ati_hack) *texw = (*texw + 511) & ~511;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
207 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
208
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16593
diff changeset
209 //! maximum size of custom fragment program
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
210 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024)
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
211 static void update_yuvconv(void) {
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
212 int xs, ys;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
213 float bri = eq_bri / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
214 float cont = (eq_cont + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
215 float hue = eq_hue / 100.0 * 3.1415927;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
216 float sat = (eq_sat + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
217 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
218 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
219 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
220 gl_conversion_params_t params = {gl_target, yuvconvtype,
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
221 {colorspace, levelconv, bri, cont, hue, sat, rgamma, ggamma, bgamma},
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
222 texture_width, texture_height, 0, 0, filter_strength};
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
223 mp_get_chroma_shift(image_format, &xs, &ys);
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
224 params.chrom_texw = params.texw >> xs;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
225 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
226 glSetupYUVConversion(&params);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
227 if (custom_prog) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
228 FILE *f = fopen(custom_prog, "r");
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
229 if (!f)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
230 mp_msg(MSGT_VO, MSGL_WARN,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
231 "[gl] Could not read customprog %s\n", custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
232 else {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
233 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
234 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
235 fclose(f);
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18619
diff changeset
236 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
237 free(prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
238 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
239 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
240 1.0 / texture_width, 1.0 / texture_height,
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
241 texture_width, texture_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
242 }
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
243 if (custom_tex) {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
244 FILE *f = fopen(custom_tex, "r");
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
245 if (!f)
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
246 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
247 "[gl] Could not read customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
248 else {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
249 int width, height, maxval;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
250 ActiveTexture(GL_TEXTURE3);
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
251 if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0,
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
252 custom_tlin?GL_LINEAR:GL_NEAREST,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
253 f, &width, &height, &maxval))
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
254 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
255 1.0 / width, 1.0 / height, width, height);
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
256 else
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
257 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
258 "[gl] Error parsing customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
259 fclose(f);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
260 ActiveTexture(GL_TEXTURE0);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
261 }
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
262 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
263 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
264
16436
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
265 /**
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
266 * \brief remove all OSD textures and display-lists, thus clearing it.
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
267 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
268 static void clearOSD(void) {
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
269 int i;
17871
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
270 if (!osdtexCnt)
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
271 return;
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
272 DeleteTextures(osdtexCnt, osdtex);
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
273 #ifndef FAST_OSD
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
274 DeleteTextures(osdtexCnt, osdatex);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
275 for (i = 0; i < osdtexCnt; i++)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
276 DeleteLists(osdaDispList[i], 1);
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
277 #endif
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
278 for (i = 0; i < osdtexCnt; i++)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
279 DeleteLists(osdDispList[i], 1);
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
280 osdtexCnt = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
281 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
282
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
283 /**
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
284 * \brief remove textures, display list and free memory used by EOSD
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
285 */
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
286 static void clearEOSD(void) {
19934
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
287 if (eosdDispList)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
288 DeleteLists(eosdDispList, 1);
19934
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
289 eosdDispList = 0;
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
290 if (eosdtexCnt)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
291 DeleteTextures(eosdtexCnt, eosdtex);
19934
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
292 eosdtexCnt = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
293 free(eosdtex);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
294 eosdtex = NULL;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
295 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
296
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
297 static inline int is_tinytex(ass_image_t *i, int tinytexcur) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
298 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
299 }
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
300
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
301 static inline int is_smalltex(ass_image_t *i, int smalltexcur) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
302 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
303 }
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
304
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
305 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
306 *x = (tinytexcur % TINYTEX_COLS) * TINYTEX_SIZE;
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
307 *y = (tinytexcur / TINYTEX_COLS) * TINYTEX_SIZE;
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
308 }
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
309
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
310 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
311 *x = (smalltexcur % SMALLTEX_COLS) * SMALLTEX_SIZE;
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
312 *y = (smalltexcur / SMALLTEX_COLS) * SMALLTEX_SIZE;
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
313 }
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
314
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
315 /**
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
316 * \brief construct display list from ass image list
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
317 * \param img image list to create OSD from.
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
318 * A value of NULL has the same effect as clearEOSD()
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
319 */
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
320 static void genEOSD(mp_eosd_images_t *imgs) {
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
321 int sx, sy;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
322 int tinytexcur = 0;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
323 int smalltexcur = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
324 GLuint *curtex;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
325 GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
326 ass_image_t *img = imgs->imgs;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
327 ass_image_t *i;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
328
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
329 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
330 return;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
331 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
332 goto skip_upload;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
333
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
334 clearEOSD();
19935
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
335 if (!img)
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
336 return;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
337 if (!largeeosdtex[0]) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
338 glGenTextures(2, largeeosdtex);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
339 BindTexture(gl_target, largeeosdtex[0]);
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
340 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
341 BindTexture(gl_target, largeeosdtex[1]);
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
342 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
343 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
344 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
345 {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
346 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
347 continue;
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
348 if (is_tinytex(i, tinytexcur))
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
349 tinytexcur++;
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
350 else if (is_smalltex(i, smalltexcur))
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
351 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
352 else
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
353 eosdtexCnt++;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
354 }
20084
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
355 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n",
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
356 tinytexcur, smalltexcur, eosdtexCnt);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
357 if (eosdtexCnt) {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
358 eosdtex = calloc(eosdtexCnt, sizeof(GLuint));
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
359 glGenTextures(eosdtexCnt, eosdtex);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
360 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
361 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
362 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
363 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
364 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
365 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
366 continue;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
367 }
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
368 if (is_tinytex(i, tinytexcur)) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
369 tinytex_pos(tinytexcur, &x, &y);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
370 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
371 tinytexcur++;
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
372 } else if (is_smalltex(i, smalltexcur)) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
373 smalltex_pos(smalltexcur, &x, &y);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
374 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
375 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
376 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
377 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
378 BindTexture(gl_target, *curtex++);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
379 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
380 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
381 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
382 x, y, i->w, i->h, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
383 }
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
384 eosdDispList = GenLists(1);
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
385 skip_upload:
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
386 NewList(eosdDispList, GL_COMPILE);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
387 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
388 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
389 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
390 if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
391 continue;
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
392 Color4ub(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
393 if (is_tinytex(i, tinytexcur)) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
394 tinytex_pos(tinytexcur, &x, &y);
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
395 sx = sy = LARGE_EOSD_TEX_SIZE;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
396 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
397 tinytexcur++;
28814
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
398 } else if (is_smalltex(i, smalltexcur)) {
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
399 smalltex_pos(smalltexcur, &x, &y);
aa16560de0e7 Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents: 28808
diff changeset
400 sx = sy = LARGE_EOSD_TEX_SIZE;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
401 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
402 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
403 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
404 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
405 BindTexture(gl_target, *curtex++);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
406 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
407 glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
408 }
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
409 EndList();
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
410 BindTexture(gl_target, 0);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
411 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
412
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
413 /**
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
414 * \brief uninitialize OpenGL context, freeing textures, buffers etc.
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
415 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
416 static void uninitGl(void) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
417 int i = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
418 if (DeletePrograms && fragprog)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
419 DeletePrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
420 fragprog = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
421 while (default_texs[i] != 0)
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
422 i++;
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
423 if (i)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
424 DeleteTextures(i, default_texs);
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
425 default_texs[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
426 clearOSD();
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
427 clearEOSD();
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
428 if (largeeosdtex[0])
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
429 DeleteTextures(2, largeeosdtex);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
430 largeeosdtex[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
431 if (DeleteBuffers && gl_buffer)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
432 DeleteBuffers(1, &gl_buffer);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
433 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
434 gl_bufferptr = NULL;
27987
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
435 if (DeleteBuffers && gl_buffer_uv[0])
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
436 DeleteBuffers(2, gl_buffer_uv);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
437 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
438 gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0;
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
439 #ifdef CONFIG_GL_X11
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
440 if (mesa_bufferptr)
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
441 FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
29648
74f94f407c31 Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents: 29646
diff changeset
442 #endif
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
443 mesa_bufferptr = NULL;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
444 err_shown = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
445 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
446
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
447 static void autodetectGlExtensions(void) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
448 const char *extensions = GetString(GL_EXTENSIONS);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
449 const char *vendor = GetString(GL_VENDOR);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
450 const char *version = GetString(GL_VERSION);
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
451 int is_ati = 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
452 int ati_broken_pbo = 0;
30151
631442f20e95 Make vo gl print the OpenGL vendor and version strings.
reimar
parents: 30122
diff changeset
453 mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL by '%s', versions '%s'\n", 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
454 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
455 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
456 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
457 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
458 }
395034c15a4b Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents: 28255
diff changeset
459 if (ati_hack == -1) ati_hack = ati_broken_pbo;
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
460 if (force_pbo == -1) force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0;
28152
712225607a2c Do not default to rectangle=2, it is at least for ATI HD4850 cards with 8.12 drivers 20% slower at HD resolutions
reimar
parents: 28091
diff changeset
461 if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0;
28153
1c34bd14e6b6 Warn when using features that are broken due to ATI driver bugs.
reimar
parents: 28152
diff changeset
462 if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2))
28424
f14a2a438af2 Add [gl] in front of vo_gl message
reimar
parents: 28423
diff changeset
463 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
464 "Tell _them_ to fix GL_REPEAT if you have issues.\n");
28423
395034c15a4b Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents: 28255
diff changeset
465 mp_msg(MSGT_VO, MSGL_V, "[gl] Settings after autodetection: ati-hack = %i, force-pbo = %i, rectangle = %i\n",
395034c15a4b Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents: 28255
diff changeset
466 ati_hack, force_pbo, use_rectangle);
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
467 }
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
468
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
469 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
470 * \brief Initialize a (new or reused) OpenGL context.
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
471 * set global gl-related variables to their default values
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
472 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
473 static int initGl(uint32_t d_width, uint32_t d_height) {
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
474 int scale_type = mipmap_gen ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR;
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
475 autodetectGlExtensions();
30446
f77e32f1ecc0 Avoid using options before autodetectGlExtensions to allow it to change them properly.
reimar
parents: 30445
diff changeset
476 gl_target = use_rectangle == 1 ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D;
f77e32f1ecc0 Avoid using options before autodetectGlExtensions to allow it to change them properly.
reimar
parents: 30445
diff changeset
477 yuvconvtype = use_yuv | lscale << YUV_LUM_SCALER_SHIFT | cscale << YUV_CHROM_SCALER_SHIFT;
f77e32f1ecc0 Avoid using options before autodetectGlExtensions to allow it to change them properly.
reimar
parents: 30445
diff changeset
478
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
479 texSize(image_width, image_height, &texture_width, &texture_height);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
480
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
481 Disable(GL_BLEND);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
482 Disable(GL_DEPTH_TEST);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
483 DepthMask(GL_FALSE);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
484 Disable(GL_CULL_FACE);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
485 Enable(gl_target);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
486 DrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
487 TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
488
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
489 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
490 texture_width, texture_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
491
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
492 if (is_yuv) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
493 int i;
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
494 int xs, ys;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
495 mp_get_chroma_shift(image_format, &xs, &ys);
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
496 GenTextures(21, default_texs);
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
497 default_texs[21] = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
498 for (i = 0; i < 7; i++) {
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
499 ActiveTexture(GL_TEXTURE1 + i);
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
500 BindTexture(GL_TEXTURE_2D, default_texs[i]);
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
501 BindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]);
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
502 BindTexture(GL_TEXTURE_3D, default_texs[i + 14]);
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
503 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
504 ActiveTexture(GL_TEXTURE1);
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
505 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type,
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
506 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
507 if (mipmap_gen)
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
508 TexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
509 ActiveTexture(GL_TEXTURE2);
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
510 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type,
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
511 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
512 if (mipmap_gen)
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
513 TexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE);
30029
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
514 ActiveTexture(GL_TEXTURE0);
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
515 BindTexture(gl_target, 0);
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
516 }
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
517 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
518 {
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
519 if ((MASK_NOT_COMBINERS & (1 << use_yuv)) || custom_prog) {
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
520 if (!GenPrograms || !BindProgram) {
0cc0965bc4c3 Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents: 30023
diff changeset
521 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
522 } else {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
523 GenPrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
524 BindProgram(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
525 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
526 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
527 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
528 }
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
529 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type,
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
530 texture_width, texture_height, 0);
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
531 if (mipmap_gen)
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
532 TexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
533
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
534 resize(d_width, d_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
535
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
536 ClearColor( 0.0f,0.0f,0.0f,0.0f );
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
537 Clear( GL_COLOR_BUFFER_BIT );
16271
03884f9a35cc Do not set SwapInterval for values < 0.
reimar
parents: 16268
diff changeset
538 if (SwapInterval && swap_interval >= 0)
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
539 SwapInterval(swap_interval);
13920
4d4c6ac44d55 missing return for InitGl function
reimar
parents: 13871
diff changeset
540 return 1;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
541 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
542
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543 /* connect to server, create and map window,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
544 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
545 */
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28939
diff changeset
546 static int
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
547 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
548 {
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
549 int xs, ys;
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
550 image_height = height;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
551 image_width = width;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
552 image_format = format;
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
553 is_yuv = mp_get_chroma_shift(image_format, &xs, &ys) > 0;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
554 is_yuv |= (xs << 8) | (ys << 16);
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
555 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
556
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
557 int_pause = 0;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
558 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
559
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27306
diff changeset
560 #ifdef CONFIG_GUI
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
561 if (use_gui) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
562 // GUI creates and manages window for us
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
563 guiGetEvent(guiSetShVideo, 0);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
564 goto glconfig;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
565 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
566 #endif
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
567 #ifdef CONFIG_GL_WIN32
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
568 if (glctx.type == GLTYPE_W32 && !vo_w32_config(d_width, d_height, flags))
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
569 return -1;
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
570 #endif
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
571 #ifdef CONFIG_GL_X11
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
572 if (glctx.type == GLTYPE_X11) {
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
573 XVisualInfo *vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
574 if (vinfo == NULL)
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
575 {
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
576 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n");
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
577 return -1;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
578 }
29906
31fe2176a8ef Print which visual glXChooseVisual chose when running in verbose mode.
reimar
parents: 29681
diff changeset
579 mp_msg(MSGT_VO, MSGL_V, "[gl] GLX chose visual with ID 0x%x\n", (int)vinfo->visualid);
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
580
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
581 vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
582 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone),
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23505
diff changeset
583 "gl", title);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
584 }
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
585 #endif
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
586
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
587 glconfig:
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
588 if (vo_config_count)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
589 uninitGl();
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
590 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
591 return -1;
29680
57ed11e0d3ce Print error instead of crashing when mesa-buffer is used on systems
reimar
parents: 29648
diff changeset
592 if (mesa_buffer && !AllocateMemoryMESA) {
57ed11e0d3ce Print error instead of crashing when mesa-buffer is used on systems
reimar
parents: 29648
diff changeset
593 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
594 mesa_buffer = 0;
57ed11e0d3ce Print error instead of crashing when mesa-buffer is used on systems
reimar
parents: 29648
diff changeset
595 }
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
596 initGl(vo_dwidth, vo_dheight);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
597
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
598 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
601 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602 {
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
603 int e=glctx.check_events();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
604 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
605 if(e&VO_EVENT_EXPOSE && int_pause) redraw();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
606 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
607
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
608 /**
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
609 * Creates the textures and the display list needed for displaying
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
610 * an OSD part.
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
611 * Callback function for vo_draw_text().
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
612 */
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
613 static void create_osd_texture(int x0, int y0, int w, int h,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
614 unsigned char *src, unsigned char *srca,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
615 int stride)
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
616 {
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
617 // 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
618 int sx = 8, sy = 8;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
619 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
620
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
621 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
622 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
623 return;
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
624 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
625 texSize(w, h, &sx, &sy);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
626
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
627 if (osdtexCnt >= MAX_OSD_PARTS) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
628 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n");
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
629 return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
630 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
631
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
632 // create Textures for OSD part
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
633 GenTextures(1, &osdtex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
634 BindTexture(gl_target, osdtex[osdtexCnt]);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27393
diff changeset
635 glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
636 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
637 0, 0, w, h, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
638
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
639 #ifndef FAST_OSD
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
640 GenTextures(1, &osdatex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
641 BindTexture(gl_target, osdatex[osdtexCnt]);
28002
bcb567424fbc 100l, OSD alpha textures were cleared to the wrong value.
reimar
parents: 27987
diff changeset
642 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
643 {
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
644 int i;
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18872
diff changeset
645 char *tmp = malloc(stride * h);
16272
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
646 // convert alpha from weird MPlayer scale.
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
647 // 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
648 for (i = h * stride - 1; i >= 0; i--)
25951
9b51f2ba368b Support alpha for vo gl osdcolor
reimar
parents: 25912
diff changeset
649 tmp[i] = -srca[i];
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
650 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
651 0, 0, w, h, 0);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
652 free(tmp);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
653 }
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
654 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
655
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
656 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
657
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
658 // 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
659 #ifndef FAST_OSD
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
660 osdaDispList[osdtexCnt] = GenLists(1);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
661 NewList(osdaDispList[osdtexCnt], GL_COMPILE);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
662 // render alpha
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
663 BindTexture(gl_target, osdatex[osdtexCnt]);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
664 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
665 EndList();
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
666 #endif
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
667 osdDispList[osdtexCnt] = GenLists(1);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
668 NewList(osdDispList[osdtexCnt], GL_COMPILE);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
669 // render OSD
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
670 BindTexture(gl_target, osdtex[osdtexCnt]);
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
671 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
672 EndList();
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
673
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
674 osdtexCnt++;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
675 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
676
28803
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
677 /**
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
678 * \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
679 */
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
680 static void do_render_osd(int type) {
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
681 if (((type & 1) && osdtexCnt > 0) || ((type & 2) && eosdDispList)) {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
682 // set special rendering parameters
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
683 if (!scaled_osd) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
684 MatrixMode(GL_PROJECTION);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
685 PushMatrix();
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
686 LoadIdentity();
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
687 Ortho(0, vo_dwidth, vo_dheight, 0, -1, 1);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
688 }
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
689 Enable(GL_BLEND);
28803
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
690 if ((type & 2) && eosdDispList) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
691 BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
692 CallList(eosdDispList);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
693 }
28803
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
694 if ((type & 1) && osdtexCnt > 0) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
695 Color4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24));
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
696 // draw OSD
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
697 #ifndef FAST_OSD
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
698 BlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
699 CallLists(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
700 #endif
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
701 BlendFunc(GL_SRC_ALPHA, GL_ONE);
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
702 CallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
703 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
704 // set rendering parameters back to defaults
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
705 Disable(GL_BLEND);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
706 if (!scaled_osd)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
707 PopMatrix();
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
708 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
709 }
26840
ea6c5ea1aa64 Split flip_page function
reimar
parents: 26836
diff changeset
710 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
711
30084
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
712 static void draw_osd(void)
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
713 {
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
714 if (!use_osd) return;
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
715 if (vo_osd_changed(0)) {
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
716 int osd_h, osd_w;
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
717 clearOSD();
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
718 osd_w = scaled_osd ? image_width : vo_dwidth;
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
719 osd_h = scaled_osd ? image_height : vo_dheight;
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
720 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
721 image_width, image_height, create_osd_texture);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
722 }
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
723 if (vo_doublebuffering) do_render_osd(1);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
724 }
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
725
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
726 static void do_render(void) {
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
727 // Enable(GL_TEXTURE_2D);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
728 // BindTexture(GL_TEXTURE_2D, texture_id);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
729
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
730 Color3f(1,1,1);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
731 if (is_yuv || custom_prog)
30084
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
732 glEnableYUVConversion(gl_target, yuvconvtype);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
733 glDrawTex(0, 0, image_width, image_height,
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
734 0, 0, image_width, image_height,
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
735 texture_width, texture_height,
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
736 use_rectangle == 1, is_yuv,
30084
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
737 mpi_flipped ^ vo_flipped);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
738 if (is_yuv || custom_prog)
30084
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
739 glDisableYUVConversion(gl_target, yuvconvtype);
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
740 }
90755c6344c7 Move do_render_osd function to avoid a forward declaration.
reimar
parents: 30065
diff changeset
741
26840
ea6c5ea1aa64 Split flip_page function
reimar
parents: 26836
diff changeset
742 static void flip_page(void) {
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
743 if (vo_doublebuffering) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
744 if (use_glFinish) Finish();
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
745 glctx.swapGlBuffers(&glctx);
29524
b1a437cdc60d Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents: 29521
diff changeset
746 if (aspect_scaling() && use_aspect)
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
747 Clear(GL_COLOR_BUFFER_BIT);
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
748 } else {
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
749 do_render();
28803
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
750 do_render_osd(3);
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
751 if (use_glFinish) Finish();
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
752 else Flush();
26841
3822def2c61d Reorder flip_page to make moving around do_render call easier
reimar
parents: 26840
diff changeset
753 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
754 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
755
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
756 static void redraw(void) {
28803
6887c715c4fa Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents: 28590
diff changeset
757 if (vo_doublebuffering) { do_render(); do_render_osd(3); }
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
758 flip_page();
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
759 }
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
760
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
761 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
762 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
763 {
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
764 mpi_flipped = stride[0] < 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
765 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
766 x, y, w, h, slice_height);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
767 if (is_yuv) {
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
768 int xs, ys;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
769 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
770 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
771 glUploadTex(gl_target, gl_format, gl_type, src[1], stride[1],
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
772 x >> xs, y >> ys, w >> xs, h >> ys, slice_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
773 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
774 glUploadTex(gl_target, gl_format, gl_type, src[2], stride[2],
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
775 x >> xs, y >> ys, w >> xs, h >> ys, slice_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
776 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
777 }
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
778 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
779 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
780
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
781 static uint32_t get_image(mp_image_t *mpi) {
28065
aec8703ff07f Avoid one more duplicated logic.
reimar
parents: 28064
diff changeset
782 int needed_size;
16233
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
783 if (!GenBuffers || !BindBuffer || !BufferData || !MapBuffer) {
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
784 if (!err_shown)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
785 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
786 "Expect a _major_ speed penalty\n");
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
787 err_shown = 1;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
788 return VO_FALSE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
789 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
790 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
791 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
792 (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
793 return VO_FALSE;
28074
24871084fad6 ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents: 28073
diff changeset
794 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
795 else if (ati_hack) {
27874
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
796 mpi->width = texture_width;
b59875975f93 Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents: 27621
diff changeset
797 mpi->height = texture_height;
27169
78d837adc71e 100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents: 27168
diff changeset
798 }
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
799 mpi->stride[0] = mpi->width * mpi->bpp / 8;
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
800 needed_size = mpi->stride[0] * mpi->height;
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
801 if (mesa_buffer) {
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
802 #ifdef CONFIG_GL_X11
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
803 if (mesa_bufferptr && needed_size > mesa_buffersize) {
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
804 FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
805 mesa_bufferptr = NULL;
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
806 }
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
807 if (!mesa_bufferptr)
29681
8b35d8f6b063 Set sensible write frequency/priority values for AllocateMemoryMESA
reimar
parents: 29680
diff changeset
808 mesa_bufferptr = AllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 1.0, 1.0);
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
809 mesa_buffersize = needed_size;
29648
74f94f407c31 Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents: 29646
diff changeset
810 #endif
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
811 mpi->planes[0] = mesa_bufferptr;
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
812 } else {
28068
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
813 if (!gl_buffer)
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
814 GenBuffers(1, &gl_buffer);
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
815 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
816 if (needed_size > gl_buffersize) {
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
817 gl_buffersize = needed_size;
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
818 BufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize,
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
819 NULL, GL_DYNAMIC_DRAW);
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
820 }
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
821 if (!gl_bufferptr)
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
822 gl_bufferptr = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
823 mpi->planes[0] = gl_bufferptr;
279cc24cb5cc Fix indentation
reimar
parents: 28067
diff changeset
824 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
825 }
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
826 if (!mpi->planes[0]) {
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
827 if (!err_shown)
25754
e614d49112b5 Small typo in message
reimar
parents: 25729
diff changeset
828 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n"
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
829 "Expect a _major_ speed penalty\n");
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
830 err_shown = 1;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
831 return VO_FALSE;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
832 }
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
833 if (is_yuv) {
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
834 // planar YUV
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
835 int xs, ys;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
836 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
837 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
838 mpi->stride[0] = mpi->width;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
839 mpi->planes[1] = mpi->planes[0] + mpi->stride[0] * mpi->height;
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
840 mpi->stride[1] = mpi->width >> xs;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
841 mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> ys);
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
842 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
843 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
844 mpi->flags &= ~MP_IMGFLAG_COMMON_PLANE;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
845 if (!gl_buffer_uv[0]) GenBuffers(2, gl_buffer_uv);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
846 if (mpi->stride[1] * mpi->height > gl_buffersize_uv) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
847 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
848 BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height,
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
849 NULL, GL_DYNAMIC_DRAW);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
850 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
851 BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height,
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
852 NULL, GL_DYNAMIC_DRAW);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
853 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
854 }
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
855 if (!gl_bufferptr_uv[0]) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
856 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
857 gl_bufferptr_uv[0] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
858 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
859 gl_bufferptr_uv[1] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
860 }
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
861 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
862 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
863 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
864 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
865 mpi->flags |= MP_IMGFLAG_DIRECT;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
866 return VO_TRUE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
867 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
868
28164
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
869 static void clear_border(uint8_t *dst, int start, int stride, int height, int full_height, int value) {
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
870 int right_border = stride - start;
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
871 int bottom_border = full_height - height;
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
872 while (height > 0) {
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
873 memset(dst + start, value, right_border);
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
874 dst += stride;
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
875 height--;
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
876 }
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
877 if (bottom_border > 0)
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
878 memset(dst, value, stride * bottom_border);
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
879 }
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
880
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
881 static uint32_t draw_image(mp_image_t *mpi) {
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
882 int slice = slice_height;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
883 int stride[3];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
884 unsigned char *planes[3];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
885 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
886 int w = mpi->w, h = mpi->h;
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
887 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
888 goto skip_upload;
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
889 mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
890 mpi2.width = mpi2.w; mpi2.height = mpi2.h;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
891 if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) {
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
892 int bpp = is_yuv ? 8 : mpi->bpp;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
893 int xs, ys;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
894 mp_get_chroma_shift(image_format, &xs, &ys);
27089
2a7fb43a9976 100l, bpp is bits per pixel, not bytes
reimar
parents: 26842
diff changeset
895 memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp / 8, mpi->h, mpi2.stride[0], mpi->stride[0]);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
896 if (is_yuv) {
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
897 memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> xs, mpi->h >> ys, mpi2.stride[1], mpi->stride[1]);
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
898 memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> xs, mpi->h >> ys, mpi2.stride[2], mpi->stride[2]);
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
899 }
28164
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
900 if (ati_hack) { // since we have to do a full upload we need to clear the borders
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
901 clear_border(mpi2.planes[0], mpi->w * bpp / 8, mpi2.stride[0], mpi->h, mpi2.height, 0);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
902 if (is_yuv) {
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
903 clear_border(mpi2.planes[1], mpi->w >> xs, mpi2.stride[1], mpi->h >> ys, mpi2.height >> ys, 128);
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
904 clear_border(mpi2.planes[2], mpi->w >> xs, mpi2.stride[2], mpi->h >> ys, mpi2.height >> ys, 128);
28164
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
905 }
641020dbb89c Fix ugly borders problem with ati-hack
reimar
parents: 28153
diff changeset
906 }
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
907 mpi = &mpi2;
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
908 }
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
909 stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2];
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
910 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2];
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
911 mpi_flipped = stride[0] < 0;
28070
9c1fdc6420be 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents: 28069
diff changeset
912 if (mpi->flags & MP_IMGFLAG_DIRECT) {
28073
fa17a5971df6 More possible fixes for mesa-buffer mode.
reimar
parents: 28072
diff changeset
913 if (mesa_buffer) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
914 PixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1);
28073
fa17a5971df6 More possible fixes for mesa-buffer mode.
reimar
parents: 28072
diff changeset
915 w = texture_width;
fa17a5971df6 More possible fixes for mesa-buffer mode.
reimar
parents: 28072
diff changeset
916 } else {
28071
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
917 intptr_t base = (intptr_t)planes[0];
28072
aea4c94e42a5 Move one ati_hack check to a better place.
reimar
parents: 28071
diff changeset
918 if (ati_hack) { w = texture_width; h = texture_height; }
28071
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
919 if (mpi_flipped)
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
920 base += (mpi->h - 1) * stride[0];
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
921 planes[0] -= base;
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
922 planes[1] -= base;
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
923 planes[2] -= base;
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
924 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
925 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
926 gl_bufferptr = NULL;
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
927 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE))
c7b912b0cbc2 Reindent
reimar
parents: 28070
diff changeset
928 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
929 }
9c1fdc6420be 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents: 28069
diff changeset
930 slice = 0; // always "upload" full texture
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
931 }
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
932 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
933 mpi->x, mpi->y, w, h, slice);
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
934 if (is_yuv) {
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
935 int xs, ys;
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
936 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
937 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
938 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
939 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
940 gl_bufferptr_uv[0] = NULL;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
941 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
942 ActiveTexture(GL_TEXTURE1);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
943 glUploadTex(gl_target, gl_format, gl_type, planes[1], stride[1],
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
944 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
945 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) {
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
946 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
947 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
948 gl_bufferptr_uv[1] = NULL;
292b260ac2df More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents: 27927
diff changeset
949 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
950 ActiveTexture(GL_TEXTURE2);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
951 glUploadTex(gl_target, gl_format, gl_type, planes[2], stride[2],
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
952 mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys, slice);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
953 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
954 }
28070
9c1fdc6420be 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents: 28069
diff changeset
955 if (mpi->flags & MP_IMGFLAG_DIRECT) {
29939
319b62d55feb Pass all OpenGL functions through a function pointer indirection.
reimar
parents: 29938
diff changeset
956 if (mesa_buffer) PixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 0);
28070
9c1fdc6420be 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents: 28069
diff changeset
957 else BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
9c1fdc6420be 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents: 28069
diff changeset
958 }
26842
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
959 skip_upload:
c675462d66d9 Render everything as early as possible, doing as little as possible in
reimar
parents: 26841
diff changeset
960 if (vo_doublebuffering) do_render();
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
961 return VO_TRUE;
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
962 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
963
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
964 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
965 draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
966 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28939
diff changeset
967 return VO_ERROR;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
968 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
969
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
970 static int
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
971 query_format(uint32_t format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
972 {
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
973 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW |
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
974 VFCAP_FLIP |
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
975 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
976 if (use_osd)
23135
960434b7d963 Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd
reimar
parents: 23134
diff changeset
977 caps |= VFCAP_OSD | VFCAP_EOSD | (scaled_osd ? 0 : VFCAP_EOSD_UNSCALED);
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
978 if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA)
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
979 return caps;
30110
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30109
diff changeset
980 if (use_yuv && mp_get_chroma_shift(format, NULL, NULL) &&
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30109
diff changeset
981 (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
982 return caps;
19356
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
983 // 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
984 // 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
985 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
986 return 0;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
987 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
988 return 0;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
989 if (many_fmts &&
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
990 glFindFormat(format, NULL, NULL, NULL, NULL))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
991 return caps;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
992 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
993 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
994
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
995
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
996 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
997 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
998 {
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
999 uninitGl();
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1000 if (custom_prog) free(custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1001 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1002 if (custom_tex) free(custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1003 custom_tex = NULL;
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1004 uninit_mpglcontext(&glctx);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1005 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1006
30119
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1007 static int valid_csp(void *p)
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1008 {
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1009 int *csp = p;
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1010 return *csp >= -1 && *csp < MP_CSP_COUNT;
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1011 }
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1012
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1013 static int valid_csp_lvl(void *p)
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1014 {
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1015 int *lvl = p;
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1016 return *lvl >= -1 && *lvl < MP_CSP_LEVELCONV_COUNT;
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1017 }
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1018
28828
56eee6ffba9b Make data related to suboption parsing const in libvo
reimar
parents: 28814
diff changeset
1019 static const opt_t subopts[] = {
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1020 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1021 {"osd", OPT_ARG_BOOL, &use_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1022 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1023 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL},
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
1024 {"ycbcr", OPT_ARG_BOOL, &use_ycbcr, NULL},
30122
1772a5171ac7 Fix function declarations to avoid casting function pointers.
reimar
parents: 30121
diff changeset
1025 {"slice-height", OPT_ARG_INT, &slice_height, int_non_neg},
1772a5171ac7 Fix function declarations to avoid casting function pointers.
reimar
parents: 30121
diff changeset
1026 {"rectangle", OPT_ARG_INT, &use_rectangle,int_non_neg},
1772a5171ac7 Fix function declarations to avoid casting function pointers.
reimar
parents: 30121
diff changeset
1027 {"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
1028 {"colorspace", OPT_ARG_INT, &colorspace, valid_csp},
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1029 {"levelconv", OPT_ARG_INT, &levelconv, valid_csp_lvl},
30122
1772a5171ac7 Fix function declarations to avoid casting function pointers.
reimar
parents: 30121
diff changeset
1030 {"lscale", OPT_ARG_INT, &lscale, int_non_neg},
1772a5171ac7 Fix function declarations to avoid casting function pointers.
reimar
parents: 30121
diff changeset
1031 {"cscale", OPT_ARG_INT, &cscale, int_non_neg},
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1032 {"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
1033 {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL},
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
1034 {"force-pbo", OPT_ARG_BOOL, &force_pbo, NULL},
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
1035 {"mesa-buffer", OPT_ARG_BOOL, &mesa_buffer, NULL},
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
1036 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL},
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1037 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL},
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1038 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL},
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1039 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL},
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1040 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL},
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
1041 {"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
1042 {"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
1043 {"osdcolor", OPT_ARG_INT, &osd_color, NULL},
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1044 {NULL}
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1045 };
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1046
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
1047 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1048 {
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1049 enum MPGLType gltype = GLTYPE_X11;
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1050 // set defaults
30023
b7a703cf9178 Rename GL_* defines to CONFIG_GL_*
reimar
parents: 30021
diff changeset
1051 #ifdef CONFIG_GL_WIN32
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1052 gltype = GLTYPE_W32;
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1053 #endif
16012
f9e53883dfd2 Enable manyfmts by default for vo_gl
reimar
parents: 15748
diff changeset
1054 many_fmts = 1;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
1055 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
1056 scaled_osd = 0;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1057 use_aspect = 1;
28059
8f43ff543dc6 Add support for YCBCR MESA texture format to vo_gl.
reimar
parents: 28035
diff changeset
1058 use_ycbcr = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1059 use_yuv = 0;
30119
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1060 colorspace = -1;
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1061 levelconv = -1;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1062 lscale = 0;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1063 cscale = 0;
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1064 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
1065 use_rectangle = -1;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
1066 use_glFinish = 0;
28091
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
1067 ati_hack = -1;
c6ead2b85569 Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents: 28074
diff changeset
1068 force_pbo = -1;
28067
7511f7328d93 Add experimental support for glXAllocateMemoryMESA
reimar
parents: 28065
diff changeset
1069 mesa_buffer = 0;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1070 swap_interval = 1;
23878
e64c59f73527 Set -vo gl slice-height default to 0, the current default of 4 seems
reimar
parents: 23655
diff changeset
1071 slice_height = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1072 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1073 custom_tex = NULL;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1074 custom_tlin = 1;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
1075 custom_trect = 0;
30030
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
1076 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
1077 osd_color = 0xffffff;
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
1078 if (subopt_parse(arg, subopts) != 0) {
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
1079 mp_msg(MSGT_VO, MSGL_FATAL,
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1080 "\n-vo gl command line help:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1081 "Example: mplayer -vo gl:slice-height=4\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1082 "\nOptions:\n"
22087
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
1083 " nomanyfmts\n"
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
1084 " 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
1085 " slice-height=<0-...>\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1086 " Slice size for texture transfer, 0 for whole image\n"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
1087 " noosd\n"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
1088 " Do not use OpenGL OSD code\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
1089 " scaled-osd\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
1090 " Render OSD at movie resolution and scale it\n"
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1091 " noaspect\n"
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1092 " Do not do aspect scaling\n"
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1093 " rectangle=<0,1,2>\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1094 " 0: use power-of-two textures\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1095 " 1: use texture_rectangle\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1096 " 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
1097 " ati-hack\n"
e3ae3a37ea8a Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents: 26624
diff changeset
1098 " Workaround ATI bug with PBOs\n"
26681
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
1099 " force-pbo\n"
62d0831c90dc Add force-pbo suboption for faster OpenGL output.
reimar
parents: 26677
diff changeset
1100 " Force use of PBO even if this involves an extra memcpy\n"
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
1101 " glfinish\n"
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
1102 " Call glFinish() before swapping buffers\n"
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1103 " swapinterval=<n>\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1104 " Interval in displayed frames between to buffer swaps.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1105 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
1106 " Requires GLX_SGI_swap_control support to work.\n"
30033
241686e5cf5a Slightly improve vo_gl suboption documentation.
reimar
parents: 30030
diff changeset
1107 " ycbcr\n"
241686e5cf5a Slightly improve vo_gl suboption documentation.
reimar
parents: 30030
diff changeset
1108 " 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
1109 " yuv=<n>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1110 " 0: use software YUV to RGB conversion.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
1111 " 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
1112 " 2: use fragment program.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1113 " 3: use fragment program with gamma correction.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1114 " 4: use fragment program with gamma correction via lookup.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
1115 " 5: use ATI-specific method (for older cards).\n"
22087
ecd08be90726 Update gl:help output a bit
reimar
parents: 21631
diff changeset
1116 " 6: use lookup via 3D texture.\n"
30119
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1117 " colorspace=<n>\n"
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1118 " 0: MPlayer's default YUV to RGB conversion\n"
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1119 " 1: YUV to RGB according to BT.601\n"
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1120 " 2: YUV to RGB according to BT.709\n"
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1121 " 3: YUV to RGB according to SMPT-240M\n"
f5d435782075 Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents: 30110
diff changeset
1122 " 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
1123 " 5: XYZ to RGB\n"
30293
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1124 " levelconv=<n>\n"
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1125 " 0: YUV to RGB converting TV to PC levels\n"
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1126 " 1: YUV to RGB converting PC to TV levels\n"
aeab18b1923d Add support for adjustable TV <-> PC level conversion.
reimar
parents: 30151
diff changeset
1127 " 2: YUV to RGB without converting levels\n"
18695
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
1128 " lscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
1129 " 0: use standard bilinear scaling for luma.\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
1130 " 1: use improved bicubic scaling for luma.\n"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22232
diff changeset
1131 " 2: use cubic in X, linear in Y direction scaling for luma.\n"
25728
df6e9b54ecaa Document vo gl lscale=3
reimar
parents: 25485
diff changeset
1132 " 3: as 1 but without using a lookup texture.\n"
28060
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
1133 " 4: experimental unsharp masking (sharpening).\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
1134 " 5: experimental unsharp masking (sharpening) with larger radius.\n"
18695
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
1135 " cscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
1136 " 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
1137 " filter-strength=<value>\n"
70a2108520eb Add some forgotten documentation for gl suboptions
reimar
parents: 28059
diff changeset
1138 " 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
1139 " customprog=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1140 " use a custom YUV conversion program\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1141 " customtex=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1142 " 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
1143 " nocustomtlin\n"
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
1144 " use GL_NEAREST scaling for customtex texture\n"
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
1145 " customtrect\n"
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
1146 " 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
1147 " mipmapgen\n"
791920428fbd Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents: 30029
diff changeset
1148 " generate mipmaps for the video image (use with TXB in customprog)\n"
25952
bb89f92affff Slightly document alpha for OSD color
reimar
parents: 25951
diff changeset
1149 " 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
1150 " use the given color for the OSD\n"
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1151 "\n" );
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1152 return -1;
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1153 }
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1154 if (many_fmts)
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1155 mp_msg(MSGT_VO, MSGL_INFO, "[gl] using extended formats. "
16880
1267964a4dfa 10l typo, nomanyfmts should be used against playback problems.
reimar
parents: 16879
diff changeset
1156 "Use -vo gl:nomanyfmts if playback fails.\n");
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1157 mp_msg(MSGT_VO, MSGL_V, "[gl] Using %d as slice height "
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
1158 "(0 means image height).\n", slice_height);
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1159 if (!init_mpglcontext(&glctx, gltype)) return -1;
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
1160
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
1161 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1162 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1163
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1164 static const struct {
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1165 const char *name;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1166 int *value;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1167 int supportmask;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1168 } eq_map[] = {
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1169 {"brightness", &eq_bri, MASK_NOT_COMBINERS},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1170 {"contrast", &eq_cont, MASK_NOT_COMBINERS},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1171 {"saturation", &eq_sat, MASK_ALL_YUV },
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1172 {"hue", &eq_hue, MASK_ALL_YUV },
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1173 {"gamma", &eq_rgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1174 {"red_gamma", &eq_rgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1175 {"green_gamma", &eq_ggamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1176 {"blue_gamma", &eq_bgamma, MASK_GAMMA_SUPPORT},
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1177 {NULL, NULL, 0 }
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1178 };
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1179
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
1180 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1181 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1182 switch (request) {
26823
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1183 case VOCTRL_PAUSE:
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1184 case VOCTRL_RESUME:
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1185 int_pause = (request == VOCTRL_PAUSE);
a9aae3d4721d Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
reimar
parents: 26822
diff changeset
1186 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1187 case VOCTRL_QUERY_FORMAT:
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1188 return query_format(*(uint32_t*)data);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1189 case VOCTRL_GET_IMAGE:
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
1190 return get_image(data);
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
1191 case VOCTRL_DRAW_IMAGE:
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
1192 return draw_image(data);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1193 case VOCTRL_DRAW_EOSD:
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
1194 if (!data)
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 20420
diff changeset
1195 return VO_FALSE;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1196 genEOSD(data);
28808
49aaf6f7052b Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,
reimar
parents: 28803
diff changeset
1197 if (vo_doublebuffering) do_render_osd(2);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1198 return VO_TRUE;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1199 case VOCTRL_GET_EOSD_RES:
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1200 {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1201 mp_eosd_res_t *r = data;
29521
f17b515cb326 Simplify -vo gl ass border etc. dimension calculation one bit more.
reimar
parents: 29519
diff changeset
1202 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
1203 r->srcw = image_width; r->srch = image_height;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1204 r->mt = r->mb = r->ml = r->mr = 0;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1205 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
1206 else if (aspect_scaling()) {
24787
02535b3216c5 Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents: 23987
diff changeset
1207 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
1208 r->mt = r->mb = ass_border_y;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1209 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1210 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
1211 return VO_TRUE;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
1212 case VOCTRL_GUISUPPORT:
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
1213 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
1214 case VOCTRL_ONTOP:
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1215 glctx.ontop();
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
1216 return VO_TRUE;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1217 case VOCTRL_FULLSCREEN:
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1218 glctx.fullscreen();
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
1219 resize(vo_dwidth, vo_dheight);
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1220 return VO_TRUE;
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
1221 case VOCTRL_BORDER:
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1222 glctx.border();
25912
92db8b8c20d4 Redraw display on toggling border
reimar
parents: 25911
diff changeset
1223 resize(vo_dwidth, vo_dheight);
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
1224 return VO_TRUE;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1225 case VOCTRL_GET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1226 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1227 return VO_TRUE;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1228 case VOCTRL_SET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1229 if (!use_aspect) return VO_NOTIMPL;
28035
170c4c26e75d Some whitespace and () cosmetics
reimar
parents: 28002
diff changeset
1230 resize(vo_dwidth, vo_dheight);
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
1231 return VO_TRUE;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1232 case VOCTRL_GET_EQUALIZER:
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
1233 if (is_yuv) {
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1234 int i;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1235 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1236 int *value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1237 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1238 value = va_arg(va, int *);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1239 va_end(va);
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1240 for (i = 0; eq_map[i].name; i++)
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1241 if (strcmp(data, eq_map[i].name) == 0) break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1242 if (!(eq_map[i].supportmask & (1 << use_yuv)))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1243 break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1244 *value = *eq_map[i].value;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1245 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1246 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1247 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1248 case VOCTRL_SET_EQUALIZER:
30097
9d724e6def3e Support all planar YUV formats in OpenGL vos.
reimar
parents: 30084
diff changeset
1249 if (is_yuv) {
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1250 int i;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1251 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1252 int value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1253 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1254 value = va_arg(va, int);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1255 va_end(va);
26822
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1256 for (i = 0; eq_map[i].name; i++)
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1257 if (strcmp(data, eq_map[i].name) == 0) break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1258 if (!(eq_map[i].supportmask & (1 << use_yuv)))
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1259 break;
463a89df437d Simplify equalizer handling for vo gl
reimar
parents: 26755
diff changeset
1260 *eq_map[i].value = value;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1261 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1262 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1263 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1264 break;
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22149
diff changeset
1265 case VOCTRL_UPDATE_SCREENINFO:
29938
eb6c70e2cbea Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents: 29906
diff changeset
1266 glctx.update_xinerama_info();
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22149
diff changeset
1267 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1268 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1269 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1270 }