Mercurial > mplayer.hg
annotate libvo/vo_gl2.c @ 14504:e394a9cfaf3f
Transition of suboption parser to subopt-helper parser.
Removal of stupid malloc_failed function.
author | ivo |
---|---|
date | Sat, 15 Jan 2005 20:06:49 +0000 |
parents | 2804ddfb4eb7 |
children | d87cc822b343 |
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 #include <math.h> | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
11 #include <errno.h> |
2124 | 12 |
13 #include "config.h" | |
11087 | 14 #include "mp_msg.h" |
2124 | 15 #include "video_out.h" |
16 #include "video_out_internal.h" | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7964
diff
changeset
|
17 #include "sub.h" |
2124 | 18 |
12382 | 19 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13653
diff
changeset
|
20 #include "Gui/interface.h" |
12382 | 21 #endif |
22 | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
23 #include <GL/gl.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
24 #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
|
25 #include <windows.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
26 #include <GL/glext.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
27 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
28 #include <X11/Xlib.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
29 #include <X11/Xutil.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
30 #include <GL/glx.h> |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
31 #endif |
2124 | 32 #include <errno.h> |
33 | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13575
diff
changeset
|
34 #include "gl_common.h" |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
35 #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
|
36 #include "w32_common.h" |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
37 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
38 #include "x11_common.h" |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
39 #endif |
2124 | 40 #include "aspect.h" |
41 | |
42 #define NDEBUG | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
43 //#undef NDEBUG |
2124 | 44 |
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
|
45 #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
|
46 #ifdef SYS_DARWIN |
12842 | 47 #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
|
48 #endif |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
49 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
50 static vo_info_t info = |
2124 | 51 { |
2126 | 52 "X11 (OpenGL) - multiple textures version", |
2124 | 53 "gl2", |
2126 | 54 "Arpad Gereoffy & Sven Goethel", |
2124 | 55 "" |
56 }; | |
57 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
58 LIBVO_EXTERN(gl2) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
8123
diff
changeset
|
59 |
2124 | 60 /* local data */ |
61 static unsigned char *ImageData=NULL; | |
62 | |
63 /* X11 related variables */ | |
6095 | 64 //static Window vo_window; |
2124 | 65 |
66 //static int texture_id=1; | |
67 | |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
68 #ifdef GL_WIN32 |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
69 static int gl_vinfo = 0; |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
70 static HGLRC gl_context = 0; |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
71 #else |
13871 | 72 static XVisualInfo *gl_vinfo = NULL; |
73 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
|
74 #endif |
2124 | 75 |
76 static uint32_t image_width; | |
77 static uint32_t image_height; | |
78 static uint32_t image_format; | |
79 static uint32_t image_bpp; | |
80 static uint32_t image_bytes; | |
81 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
82 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
|
83 |
2124 | 84 static uint32_t texture_width; |
85 static uint32_t texture_height; | |
12448 | 86 static int texnumx, texnumy, raw_line_len; |
2124 | 87 static GLfloat texpercx, texpercy; |
13540 | 88 static struct TexSquare * texgrid = NULL; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
89 static GLint gl_internal_format; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
90 static int rgb_sz, r_sz, g_sz, b_sz, a_sz; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
91 static GLint gl_bitmap_format; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
92 static GLint gl_bitmap_type; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
93 static int isGL12 = GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
94 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
95 static int gl_bilinear=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
96 static int gl_antialias=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
97 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
98 static void (*draw_alpha_fnc) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
99 (int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
2124 | 100 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
101 |
2124 | 102 /* The squares that are tiled to make up the game screen polygon */ |
103 | |
104 struct TexSquare | |
105 { | |
106 GLubyte *texture; | |
107 GLuint texobj; | |
108 int isTexture; | |
109 GLfloat fx1, fy1, fx2, fy2, fx3, fy3, fx4, fy4; | |
110 GLfloat xcov, ycov; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
111 int isDirty; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
112 int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight; |
2124 | 113 }; |
114 | |
12448 | 115 static void resetTexturePointers(unsigned char *imageSource); |
116 | |
2124 | 117 static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py) |
118 { | |
119 *px=(float)x*texpercx; | |
120 if(*px>1.0) *px=1.0; | |
121 *py=(float)y*texpercy; | |
122 if(*py>1.0) *py=1.0; | |
123 } | |
124 | |
14090
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
125 static GLint getInternalFormat() |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
126 { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
127 #ifdef GL_WIN32 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
128 PIXELFORMATDESCRIPTOR pfd; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
129 int pf = GetPixelFormat(vo_hdc); |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
130 if (!DescribePixelFormat(vo_hdc, pf, sizeof pfd, &pfd)) { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
131 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
|
132 } else { |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
133 r_sz = pfd.cRedBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
134 g_sz = pfd.cGreenBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
135 b_sz = pfd.cBlueBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
136 a_sz = pfd.cAlphaBits; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
137 } |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
138 #else |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
139 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
|
140 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
|
141 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
|
142 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
|
143 #endif |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
144 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
145 rgb_sz=r_sz+g_sz+b_sz; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
146 if(rgb_sz<=0) rgb_sz=24; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
147 |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
148 #ifdef TEXTUREFORMAT_ALWAYS |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
149 return TEXTUREFORMAT_ALWAYS; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
150 #else |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
151 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
|
152 return GL_R3_G3_B2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
153 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
|
154 return GL_RGB4; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
155 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
|
156 return GL_RGB5; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
157 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
|
158 return GL_RGB8; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
159 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
|
160 return GL_RGB10; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
161 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
|
162 return GL_RGBA2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
163 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
|
164 return GL_RGBA4; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
165 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
|
166 return GL_RGB5_A1; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
167 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
|
168 return GL_RGBA8; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
169 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
|
170 return GL_RGB10_A2; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
171 #endif |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
172 return GL_RGB; |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
173 } |
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
174 |
10604 | 175 static int initTextures() |
2124 | 176 { |
177 struct TexSquare *tsq=0; | |
178 int e_x, e_y, s, i=0; | |
179 int x=0, y=0; | |
180 GLint format=0; | |
181 GLenum err; | |
182 | |
183 /* achieve the 2**e_x:=texture_width, 2**e_y:=texture_height */ | |
184 e_x=0; s=1; | |
185 while (s<texture_width) | |
186 { s*=2; e_x++; } | |
187 texture_width=s; | |
188 | |
189 e_y=0; s=1; | |
190 while (s<texture_height) | |
191 { s*=2; e_y++; } | |
192 texture_height=s; | |
193 | |
14090
e84643be7bd0
Move selection of internal texture format to appropriate place, should
reimar
parents:
14078
diff
changeset
|
194 gl_internal_format = getInternalFormat(); |
2124 | 195 |
196 /* Test the max texture size */ | |
197 do | |
198 { | |
199 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
200 gl_internal_format, |
2124 | 201 texture_width, texture_height, |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
202 0, gl_bitmap_format, gl_bitmap_type, NULL); |
2124 | 203 |
204 glGetTexLevelParameteriv | |
205 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format); | |
206 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
207 if (format != gl_internal_format) |
2124 | 208 { |
11988 | 209 mp_msg (MSGT_VO, MSGL_V, "[gl2] Needed texture [%dx%d] too big, trying ", |
2124 | 210 texture_height, texture_width); |
211 | |
212 if (texture_width > texture_height) | |
213 { | |
214 e_x--; | |
215 texture_width = 1; | |
216 for (i = e_x; i > 0; i--) | |
217 texture_width *= 2; | |
218 } | |
219 else | |
220 { | |
221 e_y--; | |
222 texture_height = 1; | |
223 for (i = e_y; i > 0; i--) | |
224 texture_height *= 2; | |
225 } | |
226 | |
11988 | 227 mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_height, texture_width); |
2124 | 228 |
229 if(texture_width < 64 || texture_height < 64) | |
230 { | |
11988 | 231 mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not avaiable, or texture config error !\n"); |
10604 | 232 return -1; |
2124 | 233 } |
234 } | |
235 } | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
236 while (format != gl_internal_format && texture_width > 1 && texture_height > 1); |
2124 | 237 |
238 texnumx = image_width / texture_width; | |
239 if ((image_width % texture_width) > 0) | |
240 texnumx++; | |
241 | |
242 texnumy = image_height / texture_height; | |
243 if ((image_height % texture_height) > 0) | |
244 texnumy++; | |
245 | |
11988 | 246 mp_msg(MSGT_VO, MSGL_V, "[gl2] Creating %dx%d textures of size %dx%d ...\n", |
3564 | 247 texnumx, texnumy, texture_width,texture_height); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
248 |
2124 | 249 /* Allocate the texture memory */ |
250 | |
251 texpercx = (GLfloat) texture_width / (GLfloat) image_width; | |
252 if (texpercx > 1.0) | |
253 texpercx = 1.0; | |
254 | |
255 texpercy = (GLfloat) texture_height / (GLfloat) image_height; | |
256 if (texpercy > 1.0) | |
257 texpercy = 1.0; | |
258 | |
13540 | 259 if (texgrid) |
260 free(texgrid); | |
2124 | 261 texgrid = (struct TexSquare *) |
262 calloc (texnumx * texnumy, sizeof (struct TexSquare)); | |
263 | |
12448 | 264 raw_line_len = image_width * image_bytes; |
2124 | 265 |
11988 | 266 mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n", |
2124 | 267 (int) texnumx, (int) texture_width, (int) texnumy, |
268 (int) texture_height); | |
269 | |
270 for (y = 0; y < texnumy; y++) | |
271 { | |
272 for (x = 0; x < texnumx; x++) | |
273 { | |
274 tsq = texgrid + y * texnumx + x; | |
275 | |
276 if (x == texnumx - 1 && image_width % texture_width) | |
277 tsq->xcov = | |
278 (GLfloat) (image_width % texture_width) / (GLfloat) texture_width; | |
279 else | |
280 tsq->xcov = 1.0; | |
281 | |
282 if (y == texnumy - 1 && image_height % texture_height) | |
283 tsq->ycov = | |
284 (GLfloat) (image_height % texture_height) / (GLfloat) texture_height; | |
285 else | |
286 tsq->ycov = 1.0; | |
287 | |
288 CalcFlatPoint (x, y, &(tsq->fx1), &(tsq->fy1)); | |
289 CalcFlatPoint (x + 1, y, &(tsq->fx2), &(tsq->fy2)); | |
290 CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3)); | |
291 CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4)); | |
292 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
293 tsq->isDirty=GL_TRUE; |
2124 | 294 tsq->isTexture=GL_FALSE; |
295 tsq->texobj=0; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
296 tsq->dirtyXoff=0; tsq->dirtyYoff=0; tsq->dirtyWidth=-1; tsq->dirtyHeight=-1; |
2124 | 297 |
298 glGenTextures (1, &(tsq->texobj)); | |
299 | |
300 glBindTexture (GL_TEXTURE_2D, tsq->texobj); | |
301 err = glGetError (); | |
302 if(err==GL_INVALID_ENUM) | |
303 { | |
11988 | 304 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR glBindTexture (glGenText) := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, tsq->texobj); |
2124 | 305 } |
306 | |
307 if(glIsTexture(tsq->texobj) == GL_FALSE) | |
308 { | |
11988 | 309 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR ain't a texture (glGenText): texnum x=%d, y=%d, texture=%d\n", |
2124 | 310 x, y, tsq->texobj); |
311 } else { | |
312 tsq->isTexture=GL_TRUE; | |
313 } | |
314 | |
315 glTexImage2D (GL_TEXTURE_2D, 0, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
316 gl_internal_format, |
2124 | 317 texture_width, texture_height, |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
318 0, gl_bitmap_format, gl_bitmap_type, NULL); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
319 |
2124 | 320 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0); |
321 | |
322 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | |
323 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | |
324 | |
325 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); | |
326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); | |
327 | |
328 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | |
329 | |
330 } /* for all texnumx */ | |
331 } /* for all texnumy */ | |
12448 | 332 resetTexturePointers (ImageData); |
10604 | 333 |
334 return 0; | |
2124 | 335 } |
336 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
337 static void resetTexturePointers(unsigned char *imageSource) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
338 { |
12448 | 339 unsigned char *texdata_start, *line_start; |
340 struct TexSquare *tsq = texgrid; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
341 int x=0, y=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
342 |
12448 | 343 line_start = (unsigned char *) imageSource; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
344 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
345 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
346 { |
12448 | 347 texdata_start = line_start; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
348 for (x = 0; x < texnumx; x++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
349 { |
12448 | 350 tsq->texture = texdata_start; |
351 texdata_start += texture_width * image_bytes; | |
352 tsq++; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
353 } /* for all texnumx */ |
12448 | 354 line_start += texture_height * raw_line_len; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
355 } /* for all texnumy */ |
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 setupTextureDirtyArea(int x, int y, int w,int h) |
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 struct TexSquare *square; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
361 int xi, yi, wd, ht, wh, hh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
362 int wdecr, hdecr, xh, yh; |
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 wdecr=w; hdecr=h; xh=x; yh=y; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
365 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
366 for (yi = 0; hdecr>0 && yi < texnumy; yi++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
367 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
368 if (yi < texnumy - 1) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
369 ht = texture_height; |
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 ht = image_height - texture_height * yi; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
372 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
373 xh =x; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
374 wdecr =w; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
375 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
376 for (xi = 0; wdecr>0 && xi < texnumx; xi++) |
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 square = texgrid + yi * texnumx + xi; |
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 if (xi < texnumx - 1) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
381 wd = texture_width; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
382 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
383 wd = image_width - texture_width * xi; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
384 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
385 if( 0 <= xh && xh < wd && |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
386 0 <= yh && yh < ht |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
387 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
388 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
389 square->isDirty=GL_TRUE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
390 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
391 wh=(wdecr<wd)?wdecr:wd-xh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
392 if(wh<0) wh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
393 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
394 hh=(hdecr<ht)?hdecr:ht-yh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
395 if(hh<0) hh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
396 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
397 /* |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
398 #ifndef NDEBUG |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
399 printf("\t %dx%d, %d/%d (%dx%d): %d/%d (%dx%d)\n", |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
400 xi, yi, xh, yh, wdecr, hdecr, xh, yh, wh, hh); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
401 #endif |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
402 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
403 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
404 if(xh<square->dirtyXoff) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
405 square->dirtyXoff=xh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
406 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
407 if(yh<square->dirtyYoff) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
408 square->dirtyYoff=yh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
409 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
410 square->dirtyWidth = wd-square->dirtyXoff; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
411 square->dirtyHeight = ht-square->dirtyYoff; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
412 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
413 wdecr-=wh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
414 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
415 if ( xi == texnumx - 1 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
416 hdecr-=hh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
417 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
418 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
419 xh-=wd; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
420 if(xh<0) xh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
421 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
422 yh-=ht; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
423 if(yh<0) yh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
424 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
425 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
426 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
427 static void gl_set_bilinear (int val) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
428 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
429 int x, y; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
430 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
431 if(val>=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
432 gl_bilinear = val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
433 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
434 gl_bilinear++; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
435 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
436 gl_bilinear=gl_bilinear%2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
437 /* no mipmap yet .. */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
438 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
439 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
440 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
441 for (x = 0; x < texnumx; x++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
442 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
443 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
444 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
445 switch (gl_bilinear) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
446 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
447 case 0: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
448 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
449 GL_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
450 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
451 GL_NEAREST); |
11988 | 452 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
|
453 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
454 case 1: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
455 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
456 GL_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
458 GL_LINEAR); |
11988 | 459 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
|
460 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
461 case 2: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
462 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
463 GL_LINEAR_MIPMAP_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
464 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
465 GL_LINEAR_MIPMAP_NEAREST); |
11988 | 466 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
|
467 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
468 case 3: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
469 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
470 GL_LINEAR_MIPMAP_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
471 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
472 GL_LINEAR_MIPMAP_LINEAR); |
11988 | 473 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
|
474 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
475 } |
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 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
478 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
479 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
480 static void gl_set_antialias (int val) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
481 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
482 gl_antialias=val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
483 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
484 if (gl_antialias) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
485 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
486 glShadeModel (GL_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
487 glEnable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
488 glEnable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
489 glEnable (GL_POINT_SMOOTH); |
11988 | 490 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
|
491 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
492 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
493 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
494 glShadeModel (GL_FLAT); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
495 glDisable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
496 glDisable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
497 glDisable (GL_POINT_SMOOTH); |
11988 | 498 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
|
499 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
500 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
501 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
502 |
2124 | 503 static void drawTextureDisplay () |
504 { | |
505 struct TexSquare *square; | |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8148
diff
changeset
|
506 int x, y/*, xoff=0, yoff=0, wd, ht*/; |
2124 | 507 GLenum err; |
508 | |
509 glColor3f(1.0,1.0,1.0); | |
510 | |
511 for (y = 0; y < texnumy; y++) | |
512 { | |
513 for (x = 0; x < texnumx; x++) | |
514 { | |
515 square = texgrid + y * texnumx + x; | |
516 | |
517 if(square->isTexture==GL_FALSE) | |
518 { | |
11988 | 519 mp_msg (MSGT_VO, MSGL_V, "[gl2] ain't a texture(update): texnum x=%d, y=%d, texture=%d\n", |
2124 | 520 x, y, square->texobj); |
521 continue; | |
522 } | |
523 | |
524 glBindTexture (GL_TEXTURE_2D, square->texobj); | |
525 err = glGetError (); | |
526 if(err==GL_INVALID_ENUM) | |
527 { | |
11988 | 528 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR glBindTexture := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj); |
2124 | 529 } |
530 else if(err==GL_INVALID_OPERATION) { | |
11988 | 531 mp_msg (MSGT_VO, MSGL_V, "GLERROR glBindTexture := GL_INVALID_OPERATION, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj); |
2124 | 532 } |
533 | |
534 if(glIsTexture(square->texobj) == GL_FALSE) | |
535 { | |
536 square->isTexture=GL_FALSE; | |
11988 | 537 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR ain't a texture(update): texnum x=%d, y=%d, texture=%d\n", |
2124 | 538 x, y, square->texobj); |
539 } | |
540 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
541 if(square->isDirty) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
542 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
543 glTexSubImage2D (GL_TEXTURE_2D, 0, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
544 square->dirtyXoff, square->dirtyYoff, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
545 square->dirtyWidth, square->dirtyHeight, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
546 gl_bitmap_format, gl_bitmap_type, square->texture); |
2124 | 547 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
548 square->isDirty=GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
549 square->dirtyXoff=0; square->dirtyYoff=0; square->dirtyWidth=-1; square->dirtyHeight=-1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
550 } |
2124 | 551 |
11988 | 552 mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] glTexSubImage2D texnum x=%d, y=%d, %d/%d - %d/%d\n", |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
553 x, y, square->dirtyXoff, square->dirtyYoff, square->dirtyWidth, square->dirtyHeight); |
2124 | 554 |
555 glBegin(GL_QUADS); | |
556 | |
557 glTexCoord2f (0, 0); | |
558 glVertex2f (square->fx1, square->fy1); | |
559 | |
560 glTexCoord2f (0, square->ycov); | |
561 glVertex2f (square->fx4, square->fy4); | |
562 | |
563 glTexCoord2f (square->xcov, square->ycov); | |
564 glVertex2f (square->fx3, square->fy3); | |
565 | |
566 glTexCoord2f (square->xcov, 0); | |
567 glVertex2f (square->fx2, square->fy2); | |
568 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
569 glEnd(); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
570 /* |
2124 | 571 #ifndef NDEBUG |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
572 fprintf (stdout, "[gl2] GL_QUADS texnum x=%d, y=%d, %f/%f %f/%f %f/%f %f/%f\n\n", x, y, square->fx1, square->fy1, square->fx4, square->fy4, |
2124 | 573 square->fx3, square->fy3, square->fx2, square->fy2); |
574 #endif | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
575 */ |
2124 | 576 } /* for all texnumx */ |
577 } /* for all texnumy */ | |
578 | |
11000 | 579 /* YES - let's catch this error ... |
2124 | 580 */ |
581 (void) glGetError (); | |
582 } | |
583 | |
584 | |
11087 | 585 static void resize(int *x,int *y){ |
586 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
|
587 if( vo_fs ) |
10905 | 588 { |
11087 | 589 glClear(GL_COLOR_BUFFER_BIT); |
590 aspect(x, y, A_ZOOM); | |
591 glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y); | |
10905 | 592 } else { |
11087 | 593 //aspect(x, y, A_NOZOOM); |
594 glViewport( 0, 0, *x, *y ); | |
10905 | 595 } |
2124 | 596 |
597 glMatrixMode(GL_PROJECTION); | |
598 glLoadIdentity(); | |
599 glOrtho (0, 1, 1, 0, -1.0, 1.0); | |
600 | |
601 glMatrixMode(GL_MODELVIEW); | |
602 glLoadIdentity(); | |
603 } | |
604 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
605 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
|
606 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
|
607 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
608 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
609 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
|
610 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
|
611 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
612 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
613 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
|
614 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
|
615 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
616 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
617 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
|
618 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
|
619 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
620 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
621 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
|
622 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
623 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
624 #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
|
625 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
626 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) { |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
627 o_dwidth = d_width; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
628 o_dheight = 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
|
629 vo_fs = flags & VOFLAG_FULLSCREEN; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
630 vo_vm = flags & VOFLAG_MODESWITCHING; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
631 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
632 vo_dwidth = d_width; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
633 vo_dheight = 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
|
634 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
635 destroyRenderingContext(); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
636 if (!createRenderingContext()) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
637 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
|
638 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
639 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
|
640 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
|
641 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
642 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
|
643 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
644 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
645 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
646 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
647 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
|
648 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
649 XVisualInfo template, *vi_list; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
650 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
|
651 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
652 template.screen = scr; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
653 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
|
654 if (!vi_list) return -1; |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7964
diff
changeset
|
655 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
|
656 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
|
657 int val, res, w = 0; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
658 /* 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
|
659 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
|
660 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
661 /* also it must be doublebuffered ... */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
662 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
|
663 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
664 /* 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
|
665 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
|
666 if (res || val == False) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
667 /* prefer less depth buffer size, */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
668 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
|
669 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
670 w += val*2; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
671 /* stencil buffer size */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
672 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
|
673 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
674 w += val*2; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
675 /* and colorbuffer alpha size */ |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
676 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
|
677 if (res) continue; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
678 w += val; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
679 /* 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
|
680 if (vi_list[i].class != DirectColor) w += 100; |
12709 | 681 |
682 // avoid bad-looking visual with less that 8bit per color | |
683 res = glXGetConfig(dpy, vi_list + i, GLX_RED_SIZE, &val); | |
684 if (res) continue; | |
685 if (val < 8) w += 50; | |
686 res = glXGetConfig(dpy, vi_list + i, GLX_GREEN_SIZE, &val); | |
687 if (res) continue; | |
688 if (val < 8) w += 70; | |
689 res = glXGetConfig(dpy, vi_list + i, GLX_BLUE_SIZE, &val); | |
690 if (res) continue; | |
691 if (val < 8) w += 50; | |
692 | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
693 if (w < best_weight) { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
694 best_weight = w; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
695 best_i = i; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
696 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
697 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
698 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
|
699 XFree(vi_list); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
700 return (best_weight < 1000000) ? 0 : -1; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
701 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
702 |
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
|
703 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) { |
13871 | 704 if ( vo_window == None ) |
705 { | |
2124 | 706 XSizeHints hint; |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
707 XVisualInfo *vinfo, vinfo_buf; |
2124 | 708 XEvent xev; |
709 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
710 hint.x = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
711 hint.y = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
712 hint.width = d_width; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
713 hint.height = d_height; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
714 hint.flags = PPosition | PSize; |
2124 | 715 |
716 /* Make the window */ | |
717 | |
718 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); | |
719 | |
720 // XMatchVisualInfo(mDisplay, screen, depth, TrueColor, &vinfo); | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
721 vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf; |
2124 | 722 if (vinfo == NULL) |
723 { | |
11988 | 724 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] no GLX support present\n"); |
2124 | 725 return -1; |
726 } | |
727 | |
12035
b3512c7b26ce
corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents:
11988
diff
changeset
|
728 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
|
729 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
|
730 vinfo->visual, hint.x, hint.y, hint.width, hint.height, vinfo->depth, vo_x11_create_colormap(vinfo)); |
2124 | 731 |
6095 | 732 XSelectInput(mDisplay, vo_window, StructureNotifyMask); |
2124 | 733 |
734 /* Tell other applications about this window */ | |
735 | |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
736 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
2124 | 737 |
738 /* Map window. */ | |
6095 | 739 XMapWindow(mDisplay, vo_window); |
4017 | 740 #ifdef HAVE_XINERAMA |
6095 | 741 vo_x11_xinerama_move(mDisplay,vo_window); |
4017 | 742 #endif |
11087 | 743 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
6095 | 744 XClearWindow(mDisplay,vo_window); |
2124 | 745 |
746 /* Wait for map. */ | |
747 do | |
748 { | |
749 XNextEvent(mDisplay, &xev); | |
750 } | |
6095 | 751 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
|
752 |
7763 | 753 vo_x11_classhint( mDisplay,vo_window,"gl2" ); |
754 vo_hidecursor(mDisplay,vo_window); | |
755 | |
2124 | 756 XSync(mDisplay, False); |
757 | |
6095 | 758 //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!! |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6212
diff
changeset
|
759 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
|
760 | ButtonPressMask | ButtonReleaseMask | ExposureMask |
4658 | 761 ); |
13871 | 762 } |
763 vo_x11_nofs_sizepos(0, 0, d_width, d_height); | |
764 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN)) | |
765 vo_x11_fullscreen(); | |
2124 | 766 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
767 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
|
768 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
769 |
12382 | 770 #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
|
771 static int config_glx_gui(uint32_t d_width, uint32_t d_height) { |
12382 | 772 vo_dwidth = d_width; |
773 vo_dheight = d_height; | |
774 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window | |
775 return 0; | |
776 } | |
777 #endif | |
778 | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
779 #endif |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
780 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
781 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
|
782 { |
12446
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
783 ImageData=malloc(image_width*image_height*image_bytes); |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
784 memset(ImageData,128,image_width*image_height*image_bytes); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
785 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
786 texture_width=image_width; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
787 texture_height=image_height; |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
788 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
789 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
|
790 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
|
791 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
792 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
|
793 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
|
794 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
|
795 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
|
796 |
12448 | 797 glPixelStorei (GL_UNPACK_ROW_LENGTH, image_width); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
798 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
799 /** |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
800 * may give a little speed up for a kinda burst read .. |
13575 | 801 * Also, the default of 4 will break some files. |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
802 */ |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13575
diff
changeset
|
803 glAdjustAlignment(image_width*image_bytes); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
804 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
805 glEnable (GL_TEXTURE_2D); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
806 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
807 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
|
808 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
|
809 |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
810 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
|
811 image_bpp, image_bytes, |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
812 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
|
813 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
|
814 |
11087 | 815 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
|
816 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
817 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
|
818 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
|
819 |
13926
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
820 drawTextureDisplay (); |
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
821 |
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
822 free (ImageData); |
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
823 ImageData = NULL; |
b7ba9bcd1916
Avoid drawing before transformation matrices are set up.
reimar
parents:
13877
diff
changeset
|
824 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
825 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
|
826 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
827 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
828 /* 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
|
829 * 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
|
830 */ |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
831 static uint32_t |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
832 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
|
833 { |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
834 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
|
835 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
836 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
|
837 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
|
838 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
|
839 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
840 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
|
841 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
842 aspect_save_orig(width,height); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
843 aspect_save_prescale(d_width,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
|
844 aspect_save_screenres(vo_screenwidth,vo_screenheight); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
845 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
846 aspect(&d_width,&d_height,A_NOZOOM); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
847 |
12885
010a28a43c9f
fix for people experimenting with GUI under windows
reimar
parents:
12842
diff
changeset
|
848 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32) |
12382 | 849 if (use_gui) { |
850 if (config_glx_gui(d_width, d_height) == -1) | |
851 return -1; | |
852 } else | |
853 #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
|
854 #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
|
855 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
|
856 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
857 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
|
858 #endif |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
859 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
|
860 |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
861 setGlWindow(&gl_vinfo, &gl_context, vo_window); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
862 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
863 glVersion = glGetString(GL_VERSION); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
864 |
11988 | 865 mp_msg(MSGT_VO, MSGL_V, "[gl2] OpenGL Driver Information:\n"); |
866 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
|
867 glGetString(GL_VENDOR), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
868 glGetString(GL_RENDERER), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
869 glVersion); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
870 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
871 if(glVersion[0]>'1' || |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
872 (glVersion[0]=='1' && glVersion[2]>='2') ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
873 isGL12 = GL_TRUE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
874 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
875 isGL12 = GL_FALSE; |
2124 | 876 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
877 if(isGL12) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
878 { |
11988 | 879 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
|
880 } else { |
11988 | 881 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
|
882 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
883 |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
884 glFindFormat(format, &image_bpp, NULL, &gl_bitmap_format, &gl_bitmap_type); |
2124 | 885 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
886 image_bytes=(image_bpp+7)/8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
887 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
888 draw_alpha_fnc=draw_alpha_null; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
889 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
890 switch(image_bpp) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
891 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
892 case 15: |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
893 draw_alpha_fnc=draw_alpha_15; |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13926
diff
changeset
|
894 break; |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
895 case 16: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
896 draw_alpha_fnc=draw_alpha_16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
897 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
898 case 24: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
899 draw_alpha_fnc=draw_alpha_24; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
900 case 32: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
901 draw_alpha_fnc=draw_alpha_32; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
902 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
903 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
904 if (initGl(d_width, d_height) == -1) |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
905 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
|
906 #ifndef GL_WIN32 |
11542 | 907 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
|
908 #endif |
2124 | 909 |
910 return 0; | |
911 } | |
912 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
913 static int gl_handlekey(int key) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
914 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
915 if(key=='a'||key=='A') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
916 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
917 gl_set_antialias(!gl_antialias); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
918 return 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
919 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
920 else if(key=='b'||key=='B') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
921 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
922 gl_set_bilinear(-1); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
923 return 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
924 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
925 return 1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
926 } |
2124 | 927 |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
928 #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
|
929 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
930 static void check_events(void) { |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
931 int e=vo_w32_check_events(); |
11087 | 932 if(e&VO_EVENT_RESIZE) resize(&vo_dwidth, &vo_dheight); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
933 if(e&VO_EVENT_EXPOSE && int_pause) flip_page(); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
934 } |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
935 |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
936 #else |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
937 |
2124 | 938 static void check_events(void) |
939 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
940 XEvent Event; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
941 char buf[100]; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
942 KeySym keySym; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
943 int key; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
944 static XComposeStatus stat; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
945 int e; |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
946 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
947 while ( XPending( mDisplay ) ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
948 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
949 XNextEvent( mDisplay,&Event ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
950 if( Event.type == KeyPress ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
951 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
952 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
953 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
954 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
955 : ( keySym ) ; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
956 if(gl_handlekey(key)) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
957 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
958 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
959 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
960 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
961 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
962 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
963 } |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10604
diff
changeset
|
964 e=vo_x11_check_events(mDisplay); |
11087 | 965 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
|
966 if(e&VO_EVENT_EXPOSE && int_pause) flip_page(); |
2124 | 967 } |
968 | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
969 #endif |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
970 |
2124 | 971 static void draw_osd(void) |
12446
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
972 { |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
973 if (ImageData) |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
974 vo_draw_text(image_width,image_height,draw_alpha_fnc); |
59cd81e2e1ef
fixed memory leak and removed unnecessary static variable
reimar
parents:
12394
diff
changeset
|
975 } |
2124 | 976 |
977 static void | |
978 flip_page(void) | |
979 { | |
980 | |
981 drawTextureDisplay(); | |
982 | |
983 // glFlush(); | |
984 glFinish(); | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
985 #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
|
986 SwapBuffers(vo_hdc); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
987 #else |
6095 | 988 glXSwapBuffers( mDisplay,vo_window ); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
989 #endif |
12394
b3ff1a576b8c
clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents:
12382
diff
changeset
|
990 |
b3ff1a576b8c
clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents:
12382
diff
changeset
|
991 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
|
992 glClear (GL_COLOR_BUFFER_BIT); |
2124 | 993 } |
994 | |
995 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) | |
996 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) | |
997 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
998 return 0; |
2124 | 999 } |
1000 | |
1001 static inline uint32_t | |
1002 draw_frame_x11_bgr(uint8_t *src[]) | |
1003 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1004 resetTexturePointers((unsigned char *)src[0]); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1005 ImageData=(unsigned char *)src[0]; |
2124 | 1006 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1007 // for(i=0;i<image_height;i++) ImageData[image_width*image_bytes*i+20]=128; |
2124 | 1008 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1009 setupTextureDirtyArea(0, 0, image_width, image_height); |
2124 | 1010 return 0; |
1011 } | |
1012 | |
1013 static inline uint32_t | |
1014 draw_frame_x11_rgb(uint8_t *src[]) | |
1015 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1016 resetTexturePointers((unsigned char *)src[0]); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1017 ImageData=(unsigned char *)src[0]; |
2124 | 1018 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1019 setupTextureDirtyArea(0, 0, image_width, image_height); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1020 return 0; |
2124 | 1021 } |
1022 | |
1023 | |
1024 static uint32_t | |
1025 draw_frame(uint8_t *src[]) | |
1026 { | |
1027 uint32_t res = 0; | |
1028 | |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1029 if (IMGFMT_IS_RGB(image_format)) |
2124 | 1030 res = draw_frame_x11_rgb(src); |
1031 else | |
1032 res = draw_frame_x11_bgr(src); | |
1033 | |
1034 return res; | |
1035 } | |
1036 | |
1037 static uint32_t | |
1038 query_format(uint32_t format) | |
1039 { | |
1040 switch(format){ | |
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
|
1041 #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
|
1042 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
|
1043 #else |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1044 case IMGFMT_RGB24: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1045 case IMGFMT_BGR24: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1046 // case IMGFMT_RGB32: |
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1047 // 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
|
1048 #endif |
6212 | 1049 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD; |
2124 | 1050 } |
1051 return 0; | |
1052 } | |
1053 | |
1054 | |
1055 static void | |
1056 uninit(void) | |
1057 { | |
6095 | 1058 if ( !vo_config_count ) return; |
13871 | 1059 releaseGlContext(&gl_vinfo, &gl_context); |
13540 | 1060 if (texgrid) { |
1061 free(texgrid); | |
1062 texgrid = NULL; | |
1063 } | |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1064 #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
|
1065 vo_w32_uninit(); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1066 #else |
6095 | 1067 vo_x11_uninit(); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1068 #endif |
2124 | 1069 } |
4352 | 1070 |
1071 static uint32_t preinit(const char *arg) | |
1072 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1073 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1074 { |
11988 | 1075 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Unknown subdevice: %s\n",arg); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1076 return ENOSYS; |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1077 } |
7931 | 1078 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
|
1079 return 0; |
4352 | 1080 } |
1081 | |
4596 | 1082 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 1083 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1084 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
|
1085 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
|
1086 case VOCTRL_RESUME: return (int_pause=0); |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1087 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1088 return query_format(*((uint32_t*)data)); |
12382 | 1089 case VOCTRL_GUISUPPORT: |
1090 return VO_TRUE; | |
11542 | 1091 case VOCTRL_ONTOP: |
1092 #ifdef GL_WIN32 | |
1093 vo_w32_ontop(); | |
1094 #else | |
1095 vo_x11_ontop(); | |
1096 #endif | |
1097 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
|
1098 case VOCTRL_FULLSCREEN: |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1099 #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
|
1100 vo_w32_fullscreen(); |
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1101 #else |
10143
fd3cbeb388f0
removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents:
8254
diff
changeset
|
1102 vo_x11_fullscreen(); |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1103 #endif |
14142
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
1104 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
|
1105 initGl(vo_dwidth, vo_dheight); |
f0c1ee83b216
Improving gl2 under windows, moving some functionality to gl_common
reimar
parents:
14090
diff
changeset
|
1106 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
|
1107 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
|
1108 #ifndef GL_WIN32 |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1109 case VOCTRL_SET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1110 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1111 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1112 int value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1113 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1114 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1115 value = va_arg(ap, int); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1116 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1117 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
|
1118 } |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1119 case VOCTRL_GET_EQUALIZER: |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1120 { |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1121 va_list ap; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1122 int *value; |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1123 |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1124 va_start(ap, data); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1125 value = va_arg(ap, int *); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1126 va_end(ap); |
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7931
diff
changeset
|
1127 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
|
1128 } |
10880
ba9557e864c0
vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents:
10757
diff
changeset
|
1129 #endif |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1130 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1131 return VO_NOTIMPL; |
4352 | 1132 } |