Mercurial > mplayer.hg
annotate libvo/vo_gl2.c @ 23649:404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
author | reimar |
---|---|
date | Tue, 26 Jun 2007 15:51:49 +0000 |
parents | 09f454fc4d79 |
children | 9c935f7e5b22 |
rev | line source |
---|---|
2124 | 1 /* |
2 * video_out_gl.c, X11/OpenGL interface | |
3 * based on video_out_x11 by Aaron Holtzman, | |
4 * and WS opengl window manager by Pontscho/Fresh! | |
5 */ | |
6 | |
7 #include <stdio.h> | |
8 #include <stdlib.h> | |
9 #include <string.h> | |
10 | |
11 #include "config.h" | |
11087 | 12 #include "mp_msg.h" |
16475 | 13 #include "subopt-helper.h" |
2124 | 14 #include "video_out.h" |
15 #include "video_out_internal.h" | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7964
diff
changeset
|
16 #include "sub.h" |
2124 | 17 |
18742 | 18 #include "gl_common.h" |
19 #include "aspect.h" | |
12382 | 20 #ifdef HAVE_NEW_GUI |
23077 | 21 #include "gui/interface.h" |
12382 | 22 #endif |
23 | |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
24 #undef TEXTUREFORMAT_ALWAYS |
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
25 #ifdef SYS_DARWIN |
12842 | 26 #define TEXTUREFORMAT_ALWAYS GL_RGBA8 |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
27 #endif |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
28 |
16594
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
29 //! force texture height, useful for debugging |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
30 #define TEXTURE_HEIGHT 128 |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
31 #undef TEXTURE_HEIGHT |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
32 //! force texture width, useful for debugging |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
33 #define TEXTURE_WIDTH 128 |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
34 #undef TEXTURE_WIDTH |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
35 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
36 static vo_info_t info = |
2124 | 37 { |
2126 | 38 "X11 (OpenGL) - multiple textures version", |
2124 | 39 "gl2", |
2126 | 40 "Arpad Gereoffy & Sven Goethel", |
2124 | 41 "" |
42 }; | |
43 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
44 LIBVO_EXTERN(gl2) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
45 |
2124 | 46 /* local data */ |
47 static unsigned char *ImageData=NULL; | |
48 | |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
49 #ifdef GL_WIN32 |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
50 static int gl_vinfo = 0; |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
51 static HGLRC gl_context = 0; |
21631 | 52 #define update_xinerama_info w32_update_xinerama_info |
53 #define vo_init vo_w32_init | |
54 #define vo_window vo_w32_window | |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
55 #else |
13871 | 56 static XVisualInfo *gl_vinfo = NULL; |
57 static GLXContext gl_context = 0; | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
58 #endif |
2124 | 59 |
60 static uint32_t image_width; | |
61 static uint32_t image_height; | |
62 static uint32_t image_format; | |
63 static uint32_t image_bpp; | |
64 static uint32_t image_bytes; | |
65 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
66 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
67 |
2124 | 68 static uint32_t texture_width; |
69 static uint32_t texture_height; | |
12448 | 70 static int texnumx, texnumy, raw_line_len; |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
71 static int texdirty; |
13540 | 72 static struct TexSquare * texgrid = NULL; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
73 static GLuint fragprog; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
74 static GLuint lookupTex; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
75 static GLint gl_internal_format; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
76 static int rgb_sz, r_sz, g_sz, b_sz, a_sz; |
16303
a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents:
16282
diff
changeset
|
77 static GLenum gl_bitmap_format; |
a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents:
16282
diff
changeset
|
78 static GLenum gl_bitmap_type; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
79 static int isGL12 = GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
80 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
81 static int gl_bilinear=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
82 static int gl_antialias=0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
83 static int use_yuv; |
16475 | 84 static int use_glFinish; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
85 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
86 static void (*draw_alpha_fnc) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
87 (int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
2124 | 88 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
89 |
2124 | 90 /* The squares that are tiled to make up the game screen polygon */ |
91 | |
92 struct TexSquare | |
93 { | |
94 GLubyte *texture; | |
95 GLuint texobj; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
96 GLuint uvtexobjs[2]; |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
97 GLfloat fx, fy, fw, fh; |
2124 | 98 }; |
99 | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
100 static GLint getInternalFormat(void) |
14090
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
101 { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
102 #ifdef GL_WIN32 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
103 PIXELFORMATDESCRIPTOR pfd; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
104 int pf = GetPixelFormat(vo_hdc); |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
105 if (!DescribePixelFormat(vo_hdc, pf, sizeof pfd, &pfd)) { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
106 r_sz = g_sz = b_sz = a_sz = 0; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
107 } else { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
108 r_sz = pfd.cRedBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
109 g_sz = pfd.cGreenBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
110 b_sz = pfd.cBlueBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
111 a_sz = pfd.cAlphaBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
112 } |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
113 #else |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
114 if (glXGetConfig(mDisplay, gl_vinfo, GLX_RED_SIZE, &r_sz) != 0) r_sz = 0; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
115 if (glXGetConfig(mDisplay, gl_vinfo, GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
116 if (glXGetConfig(mDisplay, gl_vinfo, GLX_BLUE_SIZE, &b_sz) != 0) b_sz = 0; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
117 if (glXGetConfig(mDisplay, gl_vinfo, GLX_ALPHA_SIZE, &a_sz) != 0) a_sz = 0; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
118 #endif |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
119 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
120 rgb_sz=r_sz+g_sz+b_sz; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
121 if(rgb_sz<=0) rgb_sz=24; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
122 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
123 #ifdef TEXTUREFORMAT_ALWAYS |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
124 return TEXTUREFORMAT_ALWAYS; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
125 #else |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
126 if(r_sz==3 && g_sz==3 && b_sz==2 && a_sz==0) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
127 return GL_R3_G3_B2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
128 if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==0) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
129 return GL_RGB4; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
130 if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==0) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
131 return GL_RGB5; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
132 if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==0) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
133 return GL_RGB8; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
134 if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==0) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
135 return GL_RGB10; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
136 if(r_sz==2 && g_sz==2 && b_sz==2 && a_sz==2) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
137 return GL_RGBA2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
138 if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==4) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
139 return GL_RGBA4; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
140 if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==1) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
141 return GL_RGB5_A1; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
142 if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==8) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
143 return GL_RGBA8; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
144 if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==2) |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
145 return GL_RGB10_A2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
146 #endif |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
147 return GL_RGB; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
148 } |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
149 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
150 static int initTextures(void) |
2124 | 151 { |
152 struct TexSquare *tsq=0; | |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
153 GLfloat texpercx, texpercy; |
16221 | 154 int s; |
2124 | 155 int x=0, y=0; |
156 GLint format=0; | |
157 GLenum err; | |
158 | |
16222 | 159 // textures smaller than 64x64 might not be supported |
160 s=64; | |
16220
1effc23b2cb8
10l, texture_width/height initialization was removed, so use
reimar
parents:
16214
diff
changeset
|
161 while (s<image_width) |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
162 s*=2; |
2124 | 163 texture_width=s; |
164 | |
16222 | 165 s=64; |
16220
1effc23b2cb8
10l, texture_width/height initialization was removed, so use
reimar
parents:
16214
diff
changeset
|
166 while (s<image_height) |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
167 s*=2; |
2124 | 168 texture_height=s; |
169 | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
170 if (image_format != IMGFMT_YV12) |
14090
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
171 gl_internal_format = getInternalFormat(); |
2124 | 172 |
173 /* Test the max texture size */ | |
174 do | |
175 { | |
176 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
177 gl_internal_format, |
2124 | 178 texture_width, texture_height, |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
179 0, gl_bitmap_format, gl_bitmap_type, NULL); |
2124 | 180 |
181 glGetTexLevelParameteriv | |
182 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format); | |
183 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
184 if (format != gl_internal_format) |
2124 | 185 { |
11988 | 186 mp_msg (MSGT_VO, MSGL_V, "[gl2] Needed texture [%dx%d] too big, trying ", |
2124 | 187 texture_height, texture_width); |
188 | |
189 if (texture_width > texture_height) | |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
190 texture_width /= 2; |
2124 | 191 else |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
192 texture_height /= 2; |
2124 | 193 |
11988 | 194 mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_height, texture_width); |
2124 | 195 |
196 if(texture_width < 64 || texture_height < 64) | |
197 { | |
11988 | 198 mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not avaiable, or texture config error !\n"); |
10604 | 199 return -1; |
2124 | 200 } |
201 } | |
202 } | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
203 while (format != gl_internal_format && texture_width > 1 && texture_height > 1); |
16594
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
204 #ifdef TEXTURE_WIDTH |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
205 texture_width = TEXTURE_WIDTH; |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
206 #endif |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
207 #ifdef TEXTURE_HEIGHT |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
208 texture_height = TEXTURE_HEIGHT; |
7b30ec73e83e
debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents:
16590
diff
changeset
|
209 #endif |
2124 | 210 |
211 texnumx = image_width / texture_width; | |
212 if ((image_width % texture_width) > 0) | |
213 texnumx++; | |
214 | |
215 texnumy = image_height / texture_height; | |
216 if ((image_height % texture_height) > 0) | |
217 texnumy++; | |
218 | |
11988 | 219 mp_msg(MSGT_VO, MSGL_V, "[gl2] Creating %dx%d textures of size %dx%d ...\n", |
3564 | 220 texnumx, texnumy, texture_width,texture_height); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
221 |
2124 | 222 /* Allocate the texture memory */ |
223 | |
224 texpercx = (GLfloat) texture_width / (GLfloat) image_width; | |
225 texpercy = (GLfloat) texture_height / (GLfloat) image_height; | |
226 | |
13540 | 227 if (texgrid) |
228 free(texgrid); | |
23647 | 229 texgrid = calloc (texnumx * texnumy, sizeof (struct TexSquare)); |
2124 | 230 |
12448 | 231 raw_line_len = image_width * image_bytes; |
2124 | 232 |
11988 | 233 mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n", |
2124 | 234 (int) texnumx, (int) texture_width, (int) texnumy, |
235 (int) texture_height); | |
236 | |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
237 tsq = texgrid; |
2124 | 238 for (y = 0; y < texnumy; y++) |
239 { | |
240 for (x = 0; x < texnumx; x++) | |
241 { | |
242 | |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
243 tsq->fx = x * texpercx; |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
244 tsq->fy = y * texpercy; |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
245 tsq->fw = texpercx; |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
246 tsq->fh = texpercy; |
2124 | 247 |
248 tsq->texobj=0; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
249 tsq->uvtexobjs[0] = tsq->uvtexobjs[1] = 0; |
2124 | 250 |
251 glGenTextures (1, &(tsq->texobj)); | |
252 | |
253 glBindTexture (GL_TEXTURE_2D, tsq->texobj); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
254 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
255 glGenTextures(2, tsq->uvtexobjs); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
256 ActiveTexture(GL_TEXTURE1); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
257 glBindTexture (GL_TEXTURE_2D, tsq->uvtexobjs[0]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
258 ActiveTexture(GL_TEXTURE2); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
259 glBindTexture (GL_TEXTURE_2D, tsq->uvtexobjs[1]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
260 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
261 } |
2124 | 262 |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
263 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
264 texture_width, texture_height, 0); |
2124 | 265 |
266 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
267 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
268 ActiveTexture(GL_TEXTURE1); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
269 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
270 texture_width / 2, texture_height / 2, 128); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
271 ActiveTexture(GL_TEXTURE2); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
272 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
273 texture_width / 2, texture_height / 2, 128); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
274 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
275 } |
2124 | 276 |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
277 tsq++; |
2124 | 278 } /* for all texnumx */ |
279 } /* for all texnumy */ | |
10604 | 280 |
281 return 0; | |
2124 | 282 } |
283 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
284 static void resetTexturePointers(unsigned char *imageSource) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
285 { |
12448 | 286 unsigned char *texdata_start, *line_start; |
287 struct TexSquare *tsq = texgrid; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
288 int x=0, y=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
289 |
12448 | 290 line_start = (unsigned char *) imageSource; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
291 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
292 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
293 { |
12448 | 294 texdata_start = line_start; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
295 for (x = 0; x < texnumx; x++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
296 { |
12448 | 297 tsq->texture = texdata_start; |
298 texdata_start += texture_width * image_bytes; | |
299 tsq++; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
300 } /* for all texnumx */ |
12448 | 301 line_start += texture_height * raw_line_len; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
302 } /* for all texnumy */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
303 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
304 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
305 static void gl_set_bilinear (int val) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
306 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
307 int x, y; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
308 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
309 if(val>=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
310 gl_bilinear = val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
311 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
312 gl_bilinear++; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
313 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
314 gl_bilinear=gl_bilinear%2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
315 /* no mipmap yet .. */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
316 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
317 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
318 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
319 for (x = 0; x < texnumx; x++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
320 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
321 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
322 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
323 switch (gl_bilinear) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
324 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
325 case 0: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
327 GL_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
328 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
329 GL_NEAREST); |
11988 | 330 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear off\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
331 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
332 case 1: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
333 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
334 GL_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
335 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
336 GL_LINEAR); |
11988 | 337 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear linear\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
338 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
339 case 2: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
340 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
341 GL_LINEAR_MIPMAP_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
342 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
343 GL_LINEAR_MIPMAP_NEAREST); |
11988 | 344 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap nearest\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
345 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
346 case 3: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
347 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
348 GL_LINEAR_MIPMAP_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
349 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
350 GL_LINEAR_MIPMAP_LINEAR); |
11988 | 351 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap linear\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
352 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
353 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
354 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
355 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
356 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
357 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
358 static void gl_set_antialias (int val) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
359 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
360 gl_antialias=val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
361 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
362 if (gl_antialias) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
363 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
364 glShadeModel (GL_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
365 glEnable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
366 glEnable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
367 glEnable (GL_POINT_SMOOTH); |
11988 | 368 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing on\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
369 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
370 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
371 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
372 glShadeModel (GL_FLAT); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
373 glDisable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
374 glDisable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
375 glDisable (GL_POINT_SMOOTH); |
11988 | 376 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing off\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
377 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
378 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
379 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
380 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
381 static void drawTextureDisplay (void) |
2124 | 382 { |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
383 struct TexSquare *square = texgrid; |
23645
6f2f38eb4e0a
Remove some unused code and useless error checking that only clutters the code
reimar
parents:
23077
diff
changeset
|
384 int x, y; |
2124 | 385 GLenum err; |
386 | |
387 glColor3f(1.0,1.0,1.0); | |
388 | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
389 if (image_format == IMGFMT_YV12) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
390 glEnableYUVConversion(GL_TEXTURE_2D, use_yuv); |
2124 | 391 for (y = 0; y < texnumy; y++) |
392 { | |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
393 int thish = texture_height; |
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
394 if (y == texnumy - 1 && image_height % texture_height) |
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
395 thish = image_height % texture_height; |
2124 | 396 for (x = 0; x < texnumx; x++) |
397 { | |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
398 int thisw = texture_width; |
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
399 if (x == texnumx - 1 && image_width % texture_width) |
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
400 thisw = image_width % texture_width; |
2124 | 401 glBindTexture (GL_TEXTURE_2D, square->texobj); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
402 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
403 ActiveTexture(GL_TEXTURE1); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
404 glBindTexture (GL_TEXTURE_2D, square->uvtexobjs[0]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
405 ActiveTexture(GL_TEXTURE2); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
406 glBindTexture (GL_TEXTURE_2D, square->uvtexobjs[1]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
407 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
408 } |
2124 | 409 |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
410 if (texdirty) { |
16224 | 411 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type, |
412 square->texture, image_width * image_bytes, | |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
413 0, 0, |
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
414 thisw, thish, |
16224 | 415 0); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
416 } |
2124 | 417 |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
418 glDrawTex(square->fx, square->fy, square->fw, square->fh, |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
419 0, 0, texture_width, texture_height, |
17220 | 420 texture_width, texture_height, |
421 0, image_format == IMGFMT_YV12, 0); | |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
422 square++; |
2124 | 423 } /* for all texnumx */ |
424 } /* for all texnumy */ | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
425 if (image_format == IMGFMT_YV12) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
426 glDisableYUVConversion(GL_TEXTURE_2D, use_yuv); |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
427 texdirty = 0; |
2124 | 428 } |
429 | |
430 | |
11087 | 431 static void resize(int *x,int *y){ |
432 mp_msg(MSGT_VO,MSGL_V,"[gl2] Resize: %dx%d\n",*x,*y); | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
433 if( vo_fs ) |
10905 | 434 { |
11087 | 435 glClear(GL_COLOR_BUFFER_BIT); |
436 aspect(x, y, A_ZOOM); | |
16590 | 437 panscan_calc(); |
438 *x += vo_panscan_x; | |
439 *y += vo_panscan_y; | |
11087 | 440 glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y); |
10905 | 441 } else { |
11087 | 442 //aspect(x, y, A_NOZOOM); |
15748 | 443 if (WinID >= 0) { |
444 int top = 0, left = 0, w = *x, h = *y; | |
445 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight); | |
446 glViewport(top, left, w, h); | |
447 } else | |
11087 | 448 glViewport( 0, 0, *x, *y ); |
10905 | 449 } |
2124 | 450 |
451 glMatrixMode(GL_PROJECTION); | |
452 glLoadIdentity(); | |
453 glOrtho (0, 1, 1, 0, -1.0, 1.0); | |
454 | |
455 glMatrixMode(GL_MODELVIEW); | |
456 glLoadIdentity(); | |
457 } | |
458 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
459 static void draw_alpha_32(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
460 vo_draw_alpha_rgb32(w,h,src,srca,stride,ImageData+4*(y0*image_width+x0),4*image_width); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
461 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
462 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
463 static void draw_alpha_24(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
464 vo_draw_alpha_rgb24(w,h,src,srca,stride,ImageData+3*(y0*image_width+x0),3*image_width); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
465 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
466 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
467 static void draw_alpha_16(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
468 vo_draw_alpha_rgb16(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
469 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
470 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
471 static void draw_alpha_15(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
472 vo_draw_alpha_rgb15(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
473 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
474 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
475 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
476 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
477 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
478 #ifdef GL_WIN32 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
479 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
480 static int config_w32(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { |
18079
f57317460375
fixes and cleanup for windows fullscreen switching (restore old position,
reimar
parents:
17566
diff
changeset
|
481 if (!vo_w32_config(d_width, d_height, flags)) |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
482 return -1; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
483 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
484 if (vo_fs) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
485 aspect(&d_width, &d_height, A_ZOOM); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
486 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
487 return 0; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
488 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
489 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
490 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
491 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
492 static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi) |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
493 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
494 XVisualInfo template, *vi_list; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
495 int vi_num, i, best_i, best_weight; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
496 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
497 template.screen = scr; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
498 vi_list = XGetVisualInfo(dpy, VisualScreenMask, &template, &vi_num); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
499 if (!vi_list) return -1; |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7964
diff
changeset
|
500 best_weight = 1000000; best_i=0; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
501 for (i = 0; i < vi_num; i++) { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
502 int val, res, w = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
503 /* of course, the visual must support OpenGL rendering... */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
504 res = glXGetConfig(dpy, vi_list + i, GLX_USE_GL, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
505 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
506 /* also it must be doublebuffered ... */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
507 res = glXGetConfig(dpy, vi_list + i, GLX_DOUBLEBUFFER, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
508 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
509 /* furthermore it must be RGBA (not color indexed) ... */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
510 res = glXGetConfig(dpy, vi_list + i, GLX_RGBA, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
511 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
512 /* prefer less depth buffer size, */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
513 res = glXGetConfig(dpy, vi_list + i, GLX_DEPTH_SIZE, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
514 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
515 w += val*2; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
516 /* stencil buffer size */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
517 res = glXGetConfig(dpy, vi_list + i, GLX_STENCIL_SIZE, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
518 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
519 w += val*2; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
520 /* and colorbuffer alpha size */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
521 res = glXGetConfig(dpy, vi_list + i, GLX_ALPHA_SIZE, &val); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
522 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
523 w += val; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
524 /* and finally, prefer DirectColor-ed visuals to allow color corrections */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
525 if (vi_list[i].class != DirectColor) w += 100; |
12709 | 526 |
527 // avoid bad-looking visual with less that 8bit per color | |
528 res = glXGetConfig(dpy, vi_list + i, GLX_RED_SIZE, &val); | |
529 if (res) continue; | |
530 if (val < 8) w += 50; | |
531 res = glXGetConfig(dpy, vi_list + i, GLX_GREEN_SIZE, &val); | |
532 if (res) continue; | |
533 if (val < 8) w += 70; | |
534 res = glXGetConfig(dpy, vi_list + i, GLX_BLUE_SIZE, &val); | |
535 if (res) continue; | |
536 if (val < 8) w += 50; | |
537 | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
538 if (w < best_weight) { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
539 best_weight = w; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
540 best_i = i; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
541 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
542 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
543 if (best_weight < 1000000) *res_vi = vi_list[best_i]; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
544 XFree(vi_list); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
545 return (best_weight < 1000000) ? 0 : -1; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
546 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
547 |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
548 static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { |
15748 | 549 if (WinID >= 0) { |
550 vo_window = WinID ? (Window)WinID : mRootWin; | |
16239 | 551 vo_x11_selectinput_witherr(mDisplay, vo_window, |
552 StructureNotifyMask | KeyPressMask | PointerMotionMask | | |
553 ButtonPressMask | ButtonReleaseMask | ExposureMask); | |
15748 | 554 return 0; |
555 } | |
13871 | 556 if ( vo_window == None ) |
557 { | |
2124 | 558 XSizeHints hint; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
559 XVisualInfo *vinfo, vinfo_buf; |
2124 | 560 XEvent xev; |
561 | |
15589 | 562 hint.x = vo_dx; |
563 hint.y = vo_dy; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
564 hint.width = d_width; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
565 hint.height = d_height; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
566 hint.flags = PPosition | PSize; |
2124 | 567 |
568 /* Make the window */ | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
569 vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf; |
2124 | 570 if (vinfo == NULL) |
571 { | |
11988 | 572 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] no GLX support present\n"); |
2124 | 573 return -1; |
574 } | |
575 | |
12035
b3512c7b26ce
corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents:
11988
diff
changeset
|
576 vo_fs = VO_FALSE; |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
577 vo_window = vo_x11_create_smooth_window(mDisplay, RootWindow(mDisplay,mScreen), |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
578 vinfo->visual, hint.x, hint.y, hint.width, hint.height, vinfo->depth, vo_x11_create_colormap(vinfo)); |
2124 | 579 |
22248
fb03fcc0817e
Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents:
22232
diff
changeset
|
580 vo_x11_classhint( mDisplay,vo_window,"gl2" ); |
fb03fcc0817e
Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents:
22232
diff
changeset
|
581 vo_hidecursor(mDisplay,vo_window); |
fb03fcc0817e
Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents:
22232
diff
changeset
|
582 |
6095 | 583 XSelectInput(mDisplay, vo_window, StructureNotifyMask); |
2124 | 584 |
585 /* Tell other applications about this window */ | |
586 | |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
587 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
2124 | 588 |
589 /* Map window. */ | |
6095 | 590 XMapWindow(mDisplay, vo_window); |
11087 | 591 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
6095 | 592 XClearWindow(mDisplay,vo_window); |
2124 | 593 |
594 /* Wait for map. */ | |
595 do | |
596 { | |
597 XNextEvent(mDisplay, &xev); | |
598 } | |
6095 | 599 while (xev.type != MapNotify || xev.xmap.event != vo_window); |
12035
b3512c7b26ce
corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents:
11988
diff
changeset
|
600 |
2124 | 601 XSync(mDisplay, False); |
602 | |
6095 | 603 //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!! |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6212
diff
changeset
|
604 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
605 | ButtonPressMask | ButtonReleaseMask | ExposureMask |
4658 | 606 ); |
13871 | 607 } |
15589 | 608 vo_x11_nofs_sizepos(vo_dx, vo_dy, d_width, d_height); |
13871 | 609 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN)) |
610 vo_x11_fullscreen(); | |
2124 | 611 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
612 return 0; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
613 } |
18949 | 614 #endif |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
615 |
12382 | 616 #ifdef HAVE_NEW_GUI |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
617 static int config_glx_gui(uint32_t d_width, uint32_t d_height) { |
12382 | 618 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window |
619 return 0; | |
620 } | |
621 #endif | |
622 | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
623 static int initGl(uint32_t d_width, uint32_t d_height) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
624 { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
625 fragprog = lookupTex = 0; |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
626 if (initTextures() < 0) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
627 return -1; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
628 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
629 glDisable(GL_BLEND); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
630 glDisable(GL_DEPTH_TEST); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
631 glDepthMask(GL_FALSE); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
632 glDisable(GL_CULL_FACE); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
633 glEnable (GL_TEXTURE_2D); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
634 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
635 switch (use_yuv) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
636 case YUV_CONVERSION_FRAGMENT_LOOKUP: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
637 glGenTextures(1, &lookupTex); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
638 ActiveTexture(GL_TEXTURE3); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
639 glBindTexture(GL_TEXTURE_2D, lookupTex); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
640 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
641 glBindTexture(GL_TEXTURE_2D, 0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
642 case YUV_CONVERSION_FRAGMENT_POW: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
643 case YUV_CONVERSION_FRAGMENT: |
18584
212999db0203
Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents:
18116
diff
changeset
|
644 if (!GenPrograms || !BindProgram) { |
212999db0203
Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents:
18116
diff
changeset
|
645 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n"); |
212999db0203
Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents:
18116
diff
changeset
|
646 break; |
212999db0203
Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents:
18116
diff
changeset
|
647 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
648 GenPrograms(1, &fragprog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
649 BindProgram(GL_FRAGMENT_PROGRAM, fragprog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
650 break; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
651 } |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18584
diff
changeset
|
652 glSetupYUVConversion(GL_TEXTURE_2D, use_yuv, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0, |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18584
diff
changeset
|
653 texture_width, texture_height); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
654 } |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
655 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
656 gl_set_antialias(0); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
657 gl_set_bilinear(1); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
658 |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
659 mp_msg(MSGT_VO, MSGL_V, "[gl2] Using image_bpp=%d, image_bytes=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\trgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n", |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
660 image_bpp, image_bytes, |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
661 glValName(gl_bitmap_format), glValName(gl_bitmap_type), |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
662 rgb_sz, r_sz, g_sz, b_sz, a_sz, glValName(gl_internal_format)); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
663 |
11087 | 664 resize(&d_width, &d_height); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
665 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
666 glClearColor( 0.0f,0.0f,0.0f,0.0f ); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
667 glClear( GL_COLOR_BUFFER_BIT ); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
668 |
13926
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
669 drawTextureDisplay (); |
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
670 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
671 return 0; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
672 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
673 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
674 /* connect to server, create and map window, |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
675 * allocate colors and (shared) memory |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
676 */ |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
677 static int |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
678 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
679 { |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
680 const unsigned char * glVersion; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
681 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
682 image_height = height; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
683 image_width = width; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
684 image_format = format; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
685 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
686 int_pause = 0; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
687 |
18949 | 688 #ifdef HAVE_NEW_GUI |
12382 | 689 if (use_gui) { |
690 if (config_glx_gui(d_width, d_height) == -1) | |
691 return -1; | |
18949 | 692 } |
693 #ifndef GL_WIN32 | |
694 else | |
695 #endif | |
12382 | 696 #endif |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
697 #ifdef GL_WIN32 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
698 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
699 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
700 if (config_glx(width, height, d_width, d_height, flags, title, format) == -1) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
701 #endif |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
702 return -1; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
703 |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
704 setGlWindow(&gl_vinfo, &gl_context, vo_window); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
705 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
706 glVersion = glGetString(GL_VERSION); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
707 |
11988 | 708 mp_msg(MSGT_VO, MSGL_V, "[gl2] OpenGL Driver Information:\n"); |
709 mp_msg(MSGT_VO, MSGL_V, "\tvendor: %s,\n\trenderer %s,\n\tversion %s\n", | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
710 glGetString(GL_VENDOR), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
711 glGetString(GL_RENDERER), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
712 glVersion); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
713 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
714 if(glVersion[0]>'1' || |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
715 (glVersion[0]=='1' && glVersion[2]>='2') ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
716 isGL12 = GL_TRUE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
717 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
718 isGL12 = GL_FALSE; |
2124 | 719 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
720 if(isGL12) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
721 { |
11988 | 722 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL >= 1.2 capable drivers, GOOD (16bpp and BGR is ok!)\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
723 } else { |
11988 | 724 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL < 1.2 drivers, BAD (16bpp and BGR may be damaged!)\n"); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
725 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
726 |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
727 glFindFormat(format, &image_bpp, &gl_internal_format, &gl_bitmap_format, &gl_bitmap_type); |
2124 | 728 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
729 image_bytes=(image_bpp+7)/8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
730 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
731 draw_alpha_fnc=draw_alpha_null; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
732 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
733 switch(image_bpp) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
734 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
735 case 15: |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
736 draw_alpha_fnc=draw_alpha_15; |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
737 break; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
738 case 16: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
739 draw_alpha_fnc=draw_alpha_16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
740 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
741 case 24: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
742 draw_alpha_fnc=draw_alpha_24; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
743 case 32: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
744 draw_alpha_fnc=draw_alpha_32; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
745 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
746 |
15748 | 747 if (initGl(vo_dwidth, vo_dheight) == -1) |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
748 return -1; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
749 #ifndef GL_WIN32 |
11542 | 750 if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
751 #endif |
2124 | 752 |
753 return 0; | |
754 } | |
755 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
756 static int gl_handlekey(int key) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
757 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
758 if(key=='a'||key=='A') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
759 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
760 gl_set_antialias(!gl_antialias); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
761 return 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
762 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
763 else if(key=='b'||key=='B') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
764 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
765 gl_set_bilinear(-1); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
766 return 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
767 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
768 return 1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
769 } |
2124 | 770 |
771 static void check_events(void) | |
772 { | |
17116 | 773 int e; |
774 #ifndef GL_WIN32 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
775 XEvent Event; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
776 char buf[100]; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
777 KeySym keySym; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
778 int key; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
779 static XComposeStatus stat; |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
780 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
781 while ( XPending( mDisplay ) ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
782 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
783 XNextEvent( mDisplay,&Event ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
784 if( Event.type == KeyPress ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
785 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
786 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
787 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
788 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
789 : ( keySym ) ; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
790 if(gl_handlekey(key)) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
791 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
792 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
793 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
794 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
795 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
796 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
797 } |
17116 | 798 #endif |
799 e=vo_check_events(); | |
11087 | 800 if(e&VO_EVENT_RESIZE) resize(&vo_dwidth, &vo_dheight); |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
801 if(e&VO_EVENT_EXPOSE && int_pause) flip_page(); |
2124 | 802 } |
803 | |
804 static void draw_osd(void) | |
12446
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
805 { |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
806 if (ImageData) |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
807 vo_draw_text(image_width,image_height,draw_alpha_fnc); |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
808 } |
2124 | 809 |
810 static void | |
811 flip_page(void) | |
812 { | |
813 | |
814 drawTextureDisplay(); | |
815 | |
816 // glFlush(); | |
16475 | 817 if (use_glFinish) |
2124 | 818 glFinish(); |
17116 | 819 swapGlBuffers(); |
12394
b3ff1a576b8c
clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents:
12382
diff
changeset
|
820 |
b3ff1a576b8c
clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents:
12382
diff
changeset
|
821 if (vo_fs) // Avoid flickering borders in fullscreen mode |
b3ff1a576b8c
clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents:
12382
diff
changeset
|
822 glClear (GL_COLOR_BUFFER_BIT); |
2124 | 823 } |
824 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
825 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
2124 | 826 { |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
827 uint8_t *yptr = src[0], *uptr = src[1], *vptr = src[2]; |
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
828 int ystride = stride[0], ustride = stride[1], vstride = stride[2]; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
829 int rem_h = h; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
830 struct TexSquare *texline = &texgrid[y / texture_height * texnumx]; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
831 int subtex_y = y % texture_width; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
832 while (rem_h > 0) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
833 int rem_w = w; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
834 struct TexSquare *tsq = &texline[x / texture_width]; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
835 int subtex_x = x % texture_height; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
836 int subtex_h = rem_h; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
837 if (subtex_y + subtex_h > texture_height) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
838 subtex_h = texture_height - subtex_y; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
839 while (rem_w > 0) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
840 int subtex_w = rem_w; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
841 if (subtex_x + subtex_w > texture_width) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
842 subtex_w = texture_width - subtex_x; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
843 ActiveTexture(GL_TEXTURE0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
844 glBindTexture(GL_TEXTURE_2D, tsq->texobj); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
845 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type, |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
846 yptr, ystride, subtex_x, subtex_y, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
847 subtex_w, subtex_h, 0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
848 ActiveTexture(GL_TEXTURE1); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
849 glBindTexture(GL_TEXTURE_2D, tsq->uvtexobjs[0]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
850 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type, |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
851 uptr, ustride, subtex_x / 2, subtex_y / 2, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
852 subtex_w / 2, subtex_h / 2, 0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
853 ActiveTexture(GL_TEXTURE2); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
854 glBindTexture(GL_TEXTURE_2D, tsq->uvtexobjs[1]); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
855 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type, |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
856 vptr, vstride, subtex_x / 2, subtex_y / 2, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
857 subtex_w / 2, subtex_h / 2, 0); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
858 subtex_x = 0; |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
859 yptr += subtex_w; |
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
860 uptr += subtex_w / 2; |
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
861 vptr += subtex_w / 2; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
862 tsq++; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
863 rem_w -= subtex_w; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
864 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
865 subtex_y = 0; |
16583
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
866 yptr += subtex_h * ystride - w; |
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
867 uptr += subtex_h / 2 * ustride - w / 2; |
84356c6d997b
Fix crashes and green border when using YV12 input format
reimar
parents:
16488
diff
changeset
|
868 vptr += subtex_h / 2 * vstride - w / 2; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
869 texline += texnumx; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
870 rem_h -= subtex_h; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
871 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
872 ActiveTexture(GL_TEXTURE0); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
873 return 0; |
2124 | 874 } |
875 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
876 static int |
2124 | 877 draw_frame(uint8_t *src[]) |
878 { | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
879 if (image_format == IMGFMT_YV12) { |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
880 mp_msg(MSGT_VO, MSGL_ERR, "[gl2] error: draw_frame called for YV12!\n"); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
881 return 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
882 } |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
883 ImageData=(unsigned char *)src[0]; |
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
884 resetTexturePointers(ImageData); |
23649
404d35495770
Remove overly complex and unused per-subtexture "dirty" handling
reimar
parents:
23648
diff
changeset
|
885 texdirty = 1; |
16214
ede5b4afd262
Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents:
16171
diff
changeset
|
886 return 0; |
2124 | 887 } |
888 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
889 static int |
2124 | 890 query_format(uint32_t format) |
891 { | |
892 switch(format){ | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
893 case IMGFMT_YV12: |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
894 if (use_yuv) |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
895 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
896 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
897 break; |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
898 #ifdef SYS_DARWIN |
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
899 case IMGFMT_RGB32: |
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
900 #else |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
901 case IMGFMT_RGB24: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
902 case IMGFMT_BGR24: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
903 // case IMGFMT_RGB32: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
904 // case IMGFMT_BGR32: |
12750
38c660174053
removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents:
12709
diff
changeset
|
905 #endif |
6212 | 906 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD; |
2124 | 907 } |
908 return 0; | |
909 } | |
910 | |
911 | |
912 static void | |
913 uninit(void) | |
914 { | |
6095 | 915 if ( !vo_config_count ) return; |
13871 | 916 releaseGlContext(&gl_vinfo, &gl_context); |
13540 | 917 if (texgrid) { |
918 free(texgrid); | |
919 texgrid = NULL; | |
920 } | |
17116 | 921 vo_uninit(); |
2124 | 922 } |
4352 | 923 |
16475 | 924 static opt_t subopts[] = { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
925 {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg}, |
16475 | 926 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, |
927 {NULL} | |
928 }; | |
929 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
930 static int preinit(const char *arg) |
4352 | 931 { |
16475 | 932 // set defaults |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
933 use_yuv = 0; |
16475 | 934 use_glFinish = 1; |
935 if (subopt_parse(arg, subopts) != 0) { | |
936 mp_msg(MSGT_VO, MSGL_FATAL, | |
937 "\n-vo gl2 command line help:\n" | |
938 "Example: mplayer -vo gl2:noglfinish\n" | |
939 "\nOptions:\n" | |
940 " noglfinish\n" | |
941 " Do not call glFinish() before swapping buffers\n" | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
942 " yuv=<n>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
943 " 0: use software YUV to RGB conversion.\n" |
16626 | 944 " 1: use register combiners (nVidia only, for older cards).\n" |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
945 " 2: use fragment program.\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
946 " 3: use fragment program with gamma correction.\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16475
diff
changeset
|
947 " 4: use fragment program with gamma correction via lookup.\n" |
16626 | 948 " 5: use ATI-specific method (for older cards).\n" |
16475 | 949 "\n" ); |
950 return -1; | |
951 } | |
7931 | 952 if( !vo_init() ) return -1; // Can't open X11 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
953 return 0; |
4352 | 954 } |
955 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15748
diff
changeset
|
956 static int control(uint32_t request, void *data, ...) |
4352 | 957 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
958 switch (request) { |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
959 case VOCTRL_PAUSE: return (int_pause=1); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
960 case VOCTRL_RESUME: return (int_pause=0); |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
961 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
962 return query_format(*((uint32_t*)data)); |
12382 | 963 case VOCTRL_GUISUPPORT: |
964 return VO_TRUE; | |
11542 | 965 case VOCTRL_ONTOP: |
17116 | 966 vo_ontop(); |
11542 | 967 return VO_TRUE; |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
968 case VOCTRL_FULLSCREEN: |
17116 | 969 vo_fullscreen(); |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
970 if (setGlWindow(&gl_vinfo, &gl_context, vo_window) == SET_WINDOW_REINIT) |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
971 initGl(vo_dwidth, vo_dheight); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
972 resize(&vo_dwidth, &vo_dheight); |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
973 return VO_TRUE; |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16626
diff
changeset
|
974 #ifdef GL_WIN32 |
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16626
diff
changeset
|
975 case VOCTRL_BORDER: |
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16626
diff
changeset
|
976 vo_w32_border(); |
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16626
diff
changeset
|
977 return VO_TRUE; |
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16626
diff
changeset
|
978 #endif |
16590 | 979 case VOCTRL_GET_PANSCAN: |
980 return VO_TRUE; | |
981 case VOCTRL_SET_PANSCAN: | |
982 resize (&vo_dwidth, &vo_dheight); | |
983 return VO_TRUE; | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
984 #ifndef GL_WIN32 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
985 case VOCTRL_SET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
986 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
987 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
988 int value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
989 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
990 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
991 value = va_arg(ap, int); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
992 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
993 return vo_x11_set_equalizer(data, value); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
994 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
995 case VOCTRL_GET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
996 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
997 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
998 int *value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
999 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1000 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1001 value = va_arg(ap, int *); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1002 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1003 return vo_x11_get_equalizer(data, value); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1004 } |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1005 #endif |
22232 | 1006 case VOCTRL_UPDATE_SCREENINFO: |
1007 update_xinerama_info(); | |
1008 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1009 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1010 return VO_NOTIMPL; |
4352 | 1011 } |