Mercurial > mplayer.hg
annotate libvo/vo_gl2.c @ 4965:923605707de6
sorry, 10l:)
author | pontscho |
---|---|
date | Thu, 07 Mar 2002 00:03:51 +0000 |
parents | 32e1f5042f65 |
children | b8d8d72776f2 |
rev | line source |
---|---|
2124 | 1 #define DISP |
2 | |
3 /* | |
4 * video_out_gl.c, X11/OpenGL interface | |
5 * based on video_out_x11 by Aaron Holtzman, | |
6 * and WS opengl window manager by Pontscho/Fresh! | |
7 */ | |
8 | |
9 #include <stdio.h> | |
10 #include <stdlib.h> | |
11 #include <string.h> | |
12 #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
|
13 #include <errno.h> |
2124 | 14 |
15 #include "config.h" | |
16 #include "video_out.h" | |
17 #include "video_out_internal.h" | |
18 | |
19 LIBVO_EXTERN(gl2) | |
20 | |
21 #include <X11/Xlib.h> | |
22 #include <X11/Xutil.h> | |
23 //#include <X11/keysym.h> | |
24 #include <GL/glx.h> | |
25 #include <errno.h> | |
2732 | 26 #include "../postproc/rgb2rgb.h" |
2124 | 27 |
28 #include <GL/gl.h> | |
29 | |
30 #include "x11_common.h" | |
31 #include "aspect.h" | |
32 | |
33 #define NDEBUG | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
34 //#undef NDEBUG |
2124 | 35 |
36 static vo_info_t vo_info = | |
37 { | |
2126 | 38 "X11 (OpenGL) - multiple textures version", |
2124 | 39 "gl2", |
2126 | 40 "Arpad Gereoffy & Sven Goethel", |
2124 | 41 "" |
42 }; | |
43 | |
44 /* private prototypes */ | |
45 | |
2455 | 46 static const char * tweaks_used = |
47 #ifdef HAVE_MMX | |
48 "mmx_bpp" | |
49 #else | |
50 "none" | |
51 #endif | |
52 ; | |
53 | |
2124 | 54 /* local data */ |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
55 static unsigned char *ImageDataLocal=NULL; |
2124 | 56 static unsigned char *ImageData=NULL; |
57 | |
58 /* X11 related variables */ | |
59 static Window mywindow; | |
60 static int X_already_started = 0; | |
61 | |
62 //static int texture_id=1; | |
63 | |
64 static GLXContext wsGLXContext; | |
65 static int wsGLXAttrib[] = { GLX_RGBA, | |
66 GLX_RED_SIZE,1, | |
67 GLX_GREEN_SIZE,1, | |
68 GLX_BLUE_SIZE,1, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
69 GLX_ALPHA_SIZE,0, |
2124 | 70 GLX_DOUBLEBUFFER, |
71 None }; | |
72 | |
73 | |
74 static uint32_t image_width; | |
75 static uint32_t image_height; | |
76 static uint32_t image_format; | |
77 static uint32_t image_bpp; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
78 static int image_mode; |
2124 | 79 static uint32_t image_bytes; |
80 | |
81 static uint32_t texture_width; | |
82 static uint32_t texture_height; | |
83 static int texnumx, texnumy, memory_x_len, memory_x_start_offset, raw_line_len; | |
84 static GLfloat texpercx, texpercy; | |
85 static struct TexSquare * texgrid; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
86 static GLint gl_internal_format; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
87 static char * gl_internal_format_s; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
88 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
|
89 static GLint gl_bitmap_format; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
90 static char * gl_bitmap_format_s; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
91 static GLint gl_bitmap_type; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
92 static char * gl_bitmap_type_s; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
93 static int gl_alignment; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
94 static int isGL12 = GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
95 static int isFullscreen = GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
96 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
97 static int gl_bilinear=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
98 static int gl_antialias=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
99 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
100 static int used_s=0, used_r=0, used_b=0, used_info_done=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
101 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
102 static void (*draw_alpha_fnc) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
103 (int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
2124 | 104 |
105 /* The squares that are tiled to make up the game screen polygon */ | |
106 | |
107 struct TexSquare | |
108 { | |
109 GLubyte *texture; | |
110 GLuint texobj; | |
111 int isTexture; | |
112 GLfloat fx1, fy1, fx2, fy2, fx3, fy3, fx4, fy4; | |
113 GLfloat xcov, ycov; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
114 int isDirty; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
115 int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight; |
2124 | 116 }; |
117 | |
118 static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py) | |
119 { | |
120 *px=(float)x*texpercx; | |
121 if(*px>1.0) *px=1.0; | |
122 *py=(float)y*texpercy; | |
123 if(*py>1.0) *py=1.0; | |
124 } | |
125 | |
126 static void initTextures() | |
127 { | |
128 unsigned char *line_1=0, *line_2=0, *mem_start=0; | |
129 struct TexSquare *tsq=0; | |
130 int e_x, e_y, s, i=0; | |
131 int x=0, y=0; | |
132 GLint format=0; | |
133 GLenum err; | |
134 | |
135 /* achieve the 2**e_x:=texture_width, 2**e_y:=texture_height */ | |
136 e_x=0; s=1; | |
137 while (s<texture_width) | |
138 { s*=2; e_x++; } | |
139 texture_width=s; | |
140 | |
141 e_y=0; s=1; | |
142 while (s<texture_height) | |
143 { s*=2; e_y++; } | |
144 texture_height=s; | |
145 | |
146 | |
147 /* Test the max texture size */ | |
148 do | |
149 { | |
150 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
151 gl_internal_format, |
2124 | 152 texture_width, texture_height, |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
153 0, gl_bitmap_format, gl_bitmap_type, NULL); |
2124 | 154 |
155 glGetTexLevelParameteriv | |
156 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format); | |
157 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
158 if (format != gl_internal_format) |
2124 | 159 { |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
160 fprintf (stderr, "[gl2] Needed texture [%dx%d] too big, trying ", |
2124 | 161 texture_height, texture_width); |
162 | |
163 if (texture_width > texture_height) | |
164 { | |
165 e_x--; | |
166 texture_width = 1; | |
167 for (i = e_x; i > 0; i--) | |
168 texture_width *= 2; | |
169 } | |
170 else | |
171 { | |
172 e_y--; | |
173 texture_height = 1; | |
174 for (i = e_y; i > 0; i--) | |
175 texture_height *= 2; | |
176 } | |
177 | |
178 fprintf (stderr, "[%dx%d] !\n", texture_height, texture_width); | |
179 | |
180 if(texture_width < 64 || texture_height < 64) | |
181 { | |
182 fprintf (stderr, "GLERROR: Give up .. usable texture size not avaiable, or texture config error !\n"); | |
183 exit(1); | |
184 } | |
185 } | |
186 } | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
187 while (format != gl_internal_format && texture_width > 1 && texture_height > 1); |
2124 | 188 |
189 texnumx = image_width / texture_width; | |
190 if ((image_width % texture_width) > 0) | |
191 texnumx++; | |
192 | |
193 texnumy = image_height / texture_height; | |
194 if ((image_height % texture_height) > 0) | |
195 texnumy++; | |
196 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
197 printf("[gl2] Creating %dx%d textures of size %dx%d ...\n", |
3564 | 198 texnumx, texnumy, texture_width,texture_height); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
199 |
2124 | 200 /* Allocate the texture memory */ |
201 | |
202 texpercx = (GLfloat) texture_width / (GLfloat) image_width; | |
203 if (texpercx > 1.0) | |
204 texpercx = 1.0; | |
205 | |
206 texpercy = (GLfloat) texture_height / (GLfloat) image_height; | |
207 if (texpercy > 1.0) | |
208 texpercy = 1.0; | |
209 | |
210 texgrid = (struct TexSquare *) | |
211 calloc (texnumx * texnumy, sizeof (struct TexSquare)); | |
212 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
213 line_1 = (unsigned char *) ImageDataLocal; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
214 line_2 = (unsigned char *) ImageDataLocal+(image_width*image_bytes); |
2124 | 215 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
216 mem_start = (unsigned char *) ImageDataLocal; |
2124 | 217 |
218 raw_line_len = line_2 - line_1; | |
219 | |
220 memory_x_len = raw_line_len / image_bytes; | |
221 | |
222 #ifndef NDEBUG | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
223 fprintf (stderr, "[gl2] texture-usage %d*width=%d, %d*height=%d\n", |
2124 | 224 (int) texnumx, (int) texture_width, (int) texnumy, |
225 (int) texture_height); | |
226 #endif | |
227 | |
228 for (y = 0; y < texnumy; y++) | |
229 { | |
230 for (x = 0; x < texnumx; x++) | |
231 { | |
232 tsq = texgrid + y * texnumx + x; | |
233 | |
234 if (x == texnumx - 1 && image_width % texture_width) | |
235 tsq->xcov = | |
236 (GLfloat) (image_width % texture_width) / (GLfloat) texture_width; | |
237 else | |
238 tsq->xcov = 1.0; | |
239 | |
240 if (y == texnumy - 1 && image_height % texture_height) | |
241 tsq->ycov = | |
242 (GLfloat) (image_height % texture_height) / (GLfloat) texture_height; | |
243 else | |
244 tsq->ycov = 1.0; | |
245 | |
246 CalcFlatPoint (x, y, &(tsq->fx1), &(tsq->fy1)); | |
247 CalcFlatPoint (x + 1, y, &(tsq->fx2), &(tsq->fy2)); | |
248 CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3)); | |
249 CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4)); | |
250 | |
251 /* calculate the pixel store data, | |
252 to use the machine-bitmap for our texture | |
253 */ | |
254 memory_x_start_offset = 0 * image_bytes + | |
255 x * texture_width * image_bytes; | |
256 | |
257 tsq->texture = line_1 + | |
258 y * texture_height * raw_line_len + | |
259 memory_x_start_offset; | |
260 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
261 tsq->isDirty=GL_TRUE; |
2124 | 262 tsq->isTexture=GL_FALSE; |
263 tsq->texobj=0; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
264 tsq->dirtyXoff=0; tsq->dirtyYoff=0; tsq->dirtyWidth=-1; tsq->dirtyHeight=-1; |
2124 | 265 |
266 glGenTextures (1, &(tsq->texobj)); | |
267 | |
268 glBindTexture (GL_TEXTURE_2D, tsq->texobj); | |
269 err = glGetError (); | |
270 if(err==GL_INVALID_ENUM) | |
271 { | |
272 fprintf (stderr, "GLERROR glBindTexture (glGenText) := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, tsq->texobj); | |
273 } | |
274 | |
275 if(glIsTexture(tsq->texobj) == GL_FALSE) | |
276 { | |
277 fprintf (stderr, "GLERROR ain't a texture (glGenText): texnum x=%d, y=%d, texture=%d\n", | |
278 x, y, tsq->texobj); | |
279 } else { | |
280 tsq->isTexture=GL_TRUE; | |
281 } | |
282 | |
283 glTexImage2D (GL_TEXTURE_2D, 0, | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
284 gl_internal_format, |
2124 | 285 texture_width, texture_height, |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
286 0, gl_bitmap_format, gl_bitmap_type, NULL); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
287 |
2124 | 288 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0); |
289 | |
290 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | |
291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); | |
292 | |
293 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); | |
294 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); | |
295 | |
296 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | |
297 | |
298 } /* for all texnumx */ | |
299 } /* for all texnumy */ | |
300 } | |
301 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
302 static void resetTexturePointers(unsigned char *imageSource) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
303 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
304 unsigned char *line_1=0, *line_2=0, *mem_start=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
305 struct TexSquare *tsq=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
306 int x=0, y=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
307 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
308 line_1 = (unsigned char *) imageSource; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
309 line_2 = (unsigned char *) imageSource+(image_width*image_bytes); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
310 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
311 mem_start = (unsigned char *) imageSource; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
312 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
313 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
314 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
315 for (x = 0; x < texnumx; x++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
316 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
317 tsq = texgrid + y * texnumx + x; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
318 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
319 /* calculate the pixel store data, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
320 to use the machine-bitmap for our texture |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
321 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
322 memory_x_start_offset = 0 * image_bytes + |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
323 x * texture_width * image_bytes; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
324 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
325 tsq->texture = line_1 + |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
326 y * texture_height * raw_line_len + |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
327 memory_x_start_offset; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
328 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
329 } /* for all texnumx */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
330 } /* for all texnumy */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
331 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
332 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
333 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
|
334 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
335 struct TexSquare *square; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
336 int xi, yi, wd, ht, wh, hh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
337 int wdecr, hdecr, xh, yh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
338 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
339 wdecr=w; hdecr=h; xh=x; yh=y; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
340 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
341 for (yi = 0; hdecr>0 && yi < texnumy; yi++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
342 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
343 if (yi < texnumy - 1) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
344 ht = texture_height; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
345 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
346 ht = image_height - texture_height * yi; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
347 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
348 xh =x; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
349 wdecr =w; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
350 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
351 for (xi = 0; wdecr>0 && xi < texnumx; xi++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
352 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
353 square = texgrid + yi * texnumx + xi; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
354 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
355 if (xi < texnumx - 1) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
356 wd = texture_width; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
357 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
358 wd = image_width - texture_width * xi; |
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 if( 0 <= xh && xh < wd && |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
361 0 <= yh && yh < ht |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
362 ) |
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 square->isDirty=GL_TRUE; |
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 wh=(wdecr<wd)?wdecr:wd-xh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
367 if(wh<0) wh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
368 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
369 hh=(hdecr<ht)?hdecr:ht-yh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
370 if(hh<0) hh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
371 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
372 /* |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
373 #ifndef NDEBUG |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
374 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
|
375 xi, yi, xh, yh, wdecr, hdecr, xh, yh, wh, hh); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
376 #endif |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
377 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
378 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
379 if(xh<square->dirtyXoff) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
380 square->dirtyXoff=xh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
381 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
382 if(yh<square->dirtyYoff) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
383 square->dirtyYoff=yh; |
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 square->dirtyWidth = wd-square->dirtyXoff; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
386 square->dirtyHeight = ht-square->dirtyYoff; |
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 wdecr-=wh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
389 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
390 if ( xi == texnumx - 1 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
391 hdecr-=hh; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
392 } |
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 xh-=wd; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
395 if(xh<0) xh=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 yh-=ht; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
398 if(yh<0) yh=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
399 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
400 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
401 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
402 static void gl_set_bilinear (int val) |
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 int x, y; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
405 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
406 if(val>=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
407 gl_bilinear = val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
408 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
409 gl_bilinear++; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
410 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
411 gl_bilinear=gl_bilinear%2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
412 /* no mipmap yet .. */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
413 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
414 for (y = 0; y < texnumy; y++) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
415 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
416 for (x = 0; x < texnumx; x++) |
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 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
419 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
420 switch (gl_bilinear) |
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 case 0: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
423 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
424 GL_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
425 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
426 GL_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
427 printf("[gl2] bilinear off\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
428 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
429 case 1: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
430 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
431 GL_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
432 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
433 GL_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
434 printf("[gl2] bilinear linear\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
435 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
436 case 2: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
437 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
438 GL_LINEAR_MIPMAP_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
439 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
440 GL_LINEAR_MIPMAP_NEAREST); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
441 printf("[gl2] bilinear mipmap nearest\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
442 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
443 case 3: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
445 GL_LINEAR_MIPMAP_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
446 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
447 GL_LINEAR_MIPMAP_LINEAR); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
448 printf("[gl2] bilinear mipmap linear\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
449 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
450 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
451 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
452 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
453 fflush(0); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
454 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
455 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
456 static void gl_set_antialias (int val) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
457 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
458 gl_antialias=val; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
459 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
460 if (gl_antialias) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
461 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
462 glShadeModel (GL_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
463 glEnable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
464 glEnable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
465 glEnable (GL_POINT_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
466 printf("[gl2] antialiasing on\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
467 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
468 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
469 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
470 glShadeModel (GL_FLAT); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
471 glDisable (GL_POLYGON_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
472 glDisable (GL_LINE_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
473 glDisable (GL_POINT_SMOOTH); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
474 printf("[gl2] antialiasing off\n"); |
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 fflush(0); |
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 |
2124 | 480 static void drawTextureDisplay () |
481 { | |
482 struct TexSquare *square; | |
483 int x, y, xoff=0, yoff=0, wd, ht; | |
484 GLenum err; | |
485 | |
486 glColor3f(1.0,1.0,1.0); | |
487 | |
488 for (y = 0; y < texnumy; y++) | |
489 { | |
490 for (x = 0; x < texnumx; x++) | |
491 { | |
492 square = texgrid + y * texnumx + x; | |
493 | |
494 if(square->isTexture==GL_FALSE) | |
495 { | |
496 #ifndef NDEBUG | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
497 fprintf (stderr, "[gl2] ain't a texture(update): texnum x=%d, y=%d, texture=%d\n", |
2124 | 498 x, y, square->texobj); |
499 #endif | |
500 continue; | |
501 } | |
502 | |
503 glBindTexture (GL_TEXTURE_2D, square->texobj); | |
504 err = glGetError (); | |
505 if(err==GL_INVALID_ENUM) | |
506 { | |
507 fprintf (stderr, "GLERROR glBindTexture := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj); | |
508 } | |
509 #ifndef NDEBUG | |
510 else if(err==GL_INVALID_OPERATION) { | |
511 fprintf (stderr, "GLERROR glBindTexture := GL_INVALID_OPERATION, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj); | |
512 } | |
513 #endif | |
514 | |
515 if(glIsTexture(square->texobj) == GL_FALSE) | |
516 { | |
517 square->isTexture=GL_FALSE; | |
518 fprintf (stderr, "GLERROR ain't a texture(update): texnum x=%d, y=%d, texture=%d\n", | |
519 x, y, square->texobj); | |
520 } | |
521 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
522 if(square->isDirty) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
523 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
524 glTexSubImage2D (GL_TEXTURE_2D, 0, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
525 square->dirtyXoff, square->dirtyYoff, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
526 square->dirtyWidth, square->dirtyHeight, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
527 gl_bitmap_format, gl_bitmap_type, square->texture); |
2124 | 528 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
529 square->isDirty=GL_FALSE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
530 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
|
531 } |
2124 | 532 |
533 #ifndef NDEBUG | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
534 fprintf (stdout, "[gl2] glTexSubImage2D texnum x=%d, y=%d, %d/%d - %d/%d\n", |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
535 x, y, square->dirtyXoff, square->dirtyYoff, square->dirtyWidth, square->dirtyHeight); |
2124 | 536 #endif |
537 | |
538 glBegin(GL_QUADS); | |
539 | |
540 glTexCoord2f (0, 0); | |
541 glVertex2f (square->fx1, square->fy1); | |
542 | |
543 glTexCoord2f (0, square->ycov); | |
544 glVertex2f (square->fx4, square->fy4); | |
545 | |
546 glTexCoord2f (square->xcov, square->ycov); | |
547 glVertex2f (square->fx3, square->fy3); | |
548 | |
549 glTexCoord2f (square->xcov, 0); | |
550 glVertex2f (square->fx2, square->fy2); | |
551 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
552 glEnd(); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
553 /* |
2124 | 554 #ifndef NDEBUG |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
555 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 | 556 square->fx3, square->fy3, square->fx2, square->fy2); |
557 #endif | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
558 */ |
2124 | 559 } /* for all texnumx */ |
560 } /* for all texnumy */ | |
561 | |
562 /* YES - lets catch this error ... | |
563 */ | |
564 (void) glGetError (); | |
565 } | |
566 | |
567 | |
568 static void resize(int x,int y){ | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
569 printf("[gl2] Resize: %dx%d\n",x,y); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
570 if( isFullscreen ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
571 glViewport( (vo_screenwidth-x)/2, (vo_screenheight-y)/2, x, y); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
572 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
573 glViewport( 0, 0, x, y ); |
2124 | 574 |
575 glMatrixMode(GL_PROJECTION); | |
576 glLoadIdentity(); | |
577 glOrtho (0, 1, 1, 0, -1.0, 1.0); | |
578 | |
579 glMatrixMode(GL_MODELVIEW); | |
580 glLoadIdentity(); | |
581 } | |
582 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
583 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
|
584 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
|
585 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
586 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
587 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
|
588 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
|
589 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
590 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
591 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
|
592 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
|
593 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
594 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
595 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
|
596 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
|
597 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
598 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
599 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
|
600 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
601 |
2124 | 602 /* connect to server, create and map window, |
603 * allocate colors and (shared) memory | |
604 */ | |
605 static uint32_t | |
4433 | 606 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info) |
2124 | 607 { |
608 // int screen; | |
609 unsigned int fg, bg; | |
610 char *hello = (title == NULL) ? "OpenGL rulez" : title; | |
611 // char *name = ":0.0"; | |
612 XSizeHints hint; | |
613 XVisualInfo *vinfo; | |
614 XEvent xev; | |
615 | |
616 // XGCValues xgcv; | |
617 XSetWindowAttributes xswa; | |
618 unsigned long xswamask; | |
619 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
620 const unsigned char * glVersion; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
621 |
2124 | 622 image_height = height; |
623 image_width = width; | |
624 image_format = format; | |
625 | |
626 if (X_already_started) return -1; | |
627 if(!vo_init()) return -1; | |
628 | |
2278
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
629 aspect_save_orig(width,height); |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
630 aspect_save_prescale(d_width,d_height); |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
631 aspect_save_screenres(vo_screenwidth,vo_screenheight); |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
632 |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
633 aspect(&d_width,&d_height,A_NOZOOM); |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
634 |
2124 | 635 X_already_started++; |
636 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
637 if( flags&0x01 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
638 { |
2278
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
639 isFullscreen = GL_TRUE; |
54874c78af6b
aspect changes integrated .., please check performance and conformance
sven
parents:
2276
diff
changeset
|
640 aspect(&d_width,&d_height,A_ZOOM); |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
641 hint.x = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
642 hint.y = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
643 hint.width = vo_screenwidth; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
644 hint.height = vo_screenheight; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
645 hint.flags = PPosition | PSize; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
646 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
647 hint.x = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
648 hint.y = 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
649 hint.width = d_width; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
650 hint.height = d_height; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
651 hint.flags = PPosition | PSize; |
2124 | 652 } |
653 | |
654 /* Get some colors */ | |
655 | |
656 bg = WhitePixel(mDisplay, mScreen); | |
657 fg = BlackPixel(mDisplay, mScreen); | |
658 | |
659 /* Make the window */ | |
660 | |
661 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); | |
662 | |
663 // XMatchVisualInfo(mDisplay, screen, depth, TrueColor, &vinfo); | |
664 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); | |
665 if (vinfo == NULL) | |
666 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
667 printf("[gl2] no GLX support present\n"); |
2124 | 668 return -1; |
669 } | |
670 | |
671 xswa.background_pixel = 0; | |
672 xswa.border_pixel = 1; | |
673 xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone); | |
674 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
675 | |
676 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), | |
677 hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); | |
678 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
679 vo_x11_classhint( mDisplay,mywindow,"gl2" ); |
2124 | 680 vo_hidecursor(mDisplay,mywindow); |
681 | |
682 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True ); | |
683 | |
684 if ( flags&0x01 ) vo_x11_decoration( mDisplay,mywindow,0 ); | |
685 | |
686 XSelectInput(mDisplay, mywindow, StructureNotifyMask); | |
687 | |
688 /* Tell other applications about this window */ | |
689 | |
690 XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint); | |
691 | |
692 /* Map window. */ | |
693 | |
694 XMapWindow(mDisplay, mywindow); | |
4017 | 695 #ifdef HAVE_XINERAMA |
696 vo_x11_xinerama_move(mDisplay,mywindow); | |
697 #endif | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
698 XClearWindow(mDisplay,mywindow); |
2124 | 699 |
700 /* Wait for map. */ | |
701 do | |
702 { | |
703 XNextEvent(mDisplay, &xev); | |
704 } | |
705 while (xev.type != MapNotify || xev.xmap.event != mywindow); | |
706 | |
707 XSelectInput(mDisplay, mywindow, NoEventMask); | |
708 | |
709 glXMakeCurrent( mDisplay,mywindow,wsGLXContext ); | |
710 | |
711 XFlush(mDisplay); | |
712 XSync(mDisplay, False); | |
713 | |
714 //XSelectInput(mDisplay, mywindow, StructureNotifyMask); // !!!! | |
4658 | 715 XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask |
716 #ifdef HAVE_NEW_INPUT | |
717 | ButtonPressMask | ButtonReleaseMask | |
718 #endif | |
719 ); | |
2124 | 720 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
721 glVersion = glGetString(GL_VERSION); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
722 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
723 printf("[gl2] OpenGL Driver Information:\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
724 printf("\tvendor: %s,\n\trenderer %s,\n\tversion %s\n", |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
725 glGetString(GL_VENDOR), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
726 glGetString(GL_RENDERER), |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
727 glVersion); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
728 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
729 if(glVersion[0]>'1' || |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
730 (glVersion[0]=='1' && glVersion[2]>='2') ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
731 isGL12 = GL_TRUE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
732 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
733 isGL12 = GL_FALSE; |
2124 | 734 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
735 if(isGL12) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
736 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
737 printf("[gl2] You have an OpenGL >= 1.2 capable drivers, GOOD (16bpp and BGR is ok !)\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
738 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
739 printf("[gl2] You have an OpenGL < 1.2 drivers, BAD (16bpp and BGR may be damaged !)\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
740 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
741 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
742 if(glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz)!=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
743 r_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
744 if(glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &g_sz)!=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
745 g_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
746 if(glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &b_sz)!=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
747 b_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
748 if(glXGetConfig(mDisplay,vinfo,GLX_ALPHA_SIZE, &a_sz)!=0) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
749 b_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
750 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
751 rgb_sz=r_sz+g_sz+b_sz; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
752 if(rgb_sz<=0) rgb_sz=24; |
2124 | 753 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
754 if(r_sz==3 && g_sz==3 && b_sz==2 && a_sz==0) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
755 gl_internal_format=GL_R3_G3_B2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
756 gl_internal_format_s="GL_R3_G3_B2"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
757 image_bpp = 8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
758 } else if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==0) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
759 gl_internal_format=GL_RGB4; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
760 gl_internal_format_s="GL_RGB4"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
761 image_bpp = 16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
762 } else if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==0) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
763 gl_internal_format=GL_RGB5; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
764 gl_internal_format_s="GL_RGB5"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
765 image_bpp = 16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
766 } else if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==0) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
767 gl_internal_format=GL_RGB8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
768 gl_internal_format_s="GL_RGB8"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
769 #ifdef HAVE_MMX |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
770 image_bpp = 32; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
771 #else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
772 image_bpp = 24; |
2124 | 773 #endif |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
774 } else if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==0) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
775 gl_internal_format=GL_RGB10; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
776 gl_internal_format_s="GL_RGB10"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
777 image_bpp = 32; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
778 } else if(r_sz==2 && g_sz==2 && b_sz==2 && a_sz==2) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
779 gl_internal_format=GL_RGBA2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
780 gl_internal_format_s="GL_RGBA2"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
781 image_bpp = 8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
782 } else if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==4) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
783 gl_internal_format=GL_RGBA4; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
784 gl_internal_format_s="GL_RGBA4"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
785 image_bpp = 16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
786 } else if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==1) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
787 gl_internal_format=GL_RGB5_A1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
788 gl_internal_format_s="GL_RGB5_A1"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
789 image_bpp = 16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
790 } else if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==8) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
791 gl_internal_format=GL_RGBA8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
792 gl_internal_format_s="GL_RGBA8"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
793 #ifdef HAVE_MMX |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
794 image_bpp = 32; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
795 #else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
796 image_bpp = 24; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
797 #endif |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
798 } else if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==2) { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
799 gl_internal_format=GL_RGB10_A2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
800 gl_internal_format_s="GL_RGB10_A2"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
801 image_bpp = 32; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
802 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
803 gl_internal_format=GL_RGB; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
804 gl_internal_format_s="GL_RGB"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
805 #ifdef HAVE_MMX |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
806 image_bpp = 16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
807 #else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
808 image_bpp = 24; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
809 #endif |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
810 } |
2124 | 811 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
812 if(image_format==IMGFMT_YV12) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
813 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
814 image_mode= MODE_RGB; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
815 yuv2rgb_init(image_bpp, image_mode); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
816 printf("[gl2] YUV init OK!\n"); |
2124 | 817 } else { |
818 image_bpp=format&0xFF; | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
819 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
820 if((format & IMGFMT_BGR_MASK) == IMGFMT_BGR) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
821 image_mode= MODE_BGR; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
822 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
823 image_mode= MODE_RGB; |
2124 | 824 } |
825 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
826 image_bytes=(image_bpp+7)/8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
827 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
828 draw_alpha_fnc=draw_alpha_null; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
829 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
830 switch(image_bpp) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
831 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
832 case 15: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
833 case 16: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
834 if(image_mode!=MODE_BGR) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
835 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
836 gl_bitmap_format = GL_RGB; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
837 gl_bitmap_format_s ="GL_RGB"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
838 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
839 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
840 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
841 gl_bitmap_format = GL_BGR; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
842 gl_bitmap_format_s ="GL_BGR"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
843 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
844 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
845 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
846 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
847 if (image_bpp==15) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
848 draw_alpha_fnc=draw_alpha_15; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
849 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
850 draw_alpha_fnc=draw_alpha_16; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
851 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
852 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
853 case 24: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
854 if(image_mode!=MODE_BGR) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
855 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
856 /* RGB888 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
857 gl_bitmap_format = GL_RGB; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
858 gl_bitmap_format_s ="GL_RGB"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
859 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
860 /* BGR888 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
861 gl_bitmap_format = GL_BGR; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
862 gl_bitmap_format_s ="GL_BGR"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
863 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
864 gl_bitmap_type = GL_UNSIGNED_BYTE; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
865 gl_bitmap_type_s ="GL_UNSIGNED_BYTE"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
866 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
867 draw_alpha_fnc=draw_alpha_24; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
868 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
869 case 32: |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
870 /* RGBA8888 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
871 gl_bitmap_format = GL_BGRA; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
872 gl_bitmap_format_s ="GL_BGRA"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
873 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
874 if(image_mode!=MODE_BGR) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
875 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
876 gl_bitmap_type = GL_UNSIGNED_INT_8_8_8_8_REV; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
877 gl_bitmap_type_s ="GL_UNSIGNED_INT_8_8_8_8_REV"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
878 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
879 gl_bitmap_type = GL_UNSIGNED_INT_8_8_8_8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
880 gl_bitmap_type_s ="GL_UNSIGNED_INT_8_8_8_8"; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
881 } |
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 draw_alpha_fnc=draw_alpha_32; break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
884 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
885 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
886 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
887 r_sz=0; g_sz=0; b_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
888 rgb_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
889 a_sz=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
890 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
891 ImageDataLocal=malloc(image_width*image_height*image_bytes); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
892 memset(ImageDataLocal,128,image_width*image_height*image_bytes); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
893 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
894 ImageData=ImageDataLocal; |
2124 | 895 |
896 texture_width=image_width; | |
897 texture_height=image_height; | |
898 initTextures(); | |
899 | |
900 glDisable(GL_BLEND); | |
901 glDisable(GL_DEPTH_TEST); | |
902 glDepthMask(GL_FALSE); | |
903 glDisable(GL_CULL_FACE); | |
904 | |
905 glPixelStorei (GL_UNPACK_ROW_LENGTH, memory_x_len); | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
906 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
907 /** |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
908 * may give a little speed up for a kinda burst read .. |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
909 */ |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
910 if( (image_width*image_bpp)%8 == 0 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
911 gl_alignment=8; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
912 else if( (image_width*image_bpp)%4 == 0 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
913 gl_alignment=4; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
914 else if( (image_width*image_bpp)%2 == 0 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
915 gl_alignment=2; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
916 else |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
917 gl_alignment=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
918 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
919 glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
920 |
2124 | 921 glEnable (GL_TEXTURE_2D); |
922 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
923 gl_set_antialias(0); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
924 gl_set_bilinear(1); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
925 |
2124 | 926 drawTextureDisplay (); |
927 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
928 printf("[gl2] Using image_bpp=%d, image_bytes=%d, isBGR=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\tgl_alignment=%d, rgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s, tweaks=%s\n", |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
929 image_bpp, image_bytes, image_mode==MODE_BGR, |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
930 gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment, |
2455 | 931 rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s, tweaks_used); |
2124 | 932 |
933 resize(d_width,d_height); | |
934 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
935 glClearColor( 0.0f,0.0f,0.0f,0.0f ); |
2124 | 936 glClear( GL_COLOR_BUFFER_BIT ); |
937 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
938 used_s=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
939 used_r=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
940 used_b=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
941 used_info_done=0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
942 |
2124 | 943 // printf("OpenGL setup OK!\n"); |
944 | |
945 saver_off(mDisplay); // turning off screen saver | |
946 | |
947 return 0; | |
948 } | |
949 | |
950 static const vo_info_t* | |
951 get_info(void) | |
952 { | |
953 return &vo_info; | |
954 } | |
955 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
956 static int gl_handlekey(int key) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
957 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
958 if(key=='a'||key=='A') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
959 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
960 gl_set_antialias(!gl_antialias); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
961 return 0; |
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 else if(key=='b'||key=='B') |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
964 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
965 gl_set_bilinear(-1); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
966 return 0; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
967 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
968 return 1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
969 } |
2124 | 970 |
971 static void check_events(void) | |
972 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
973 XEvent Event; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
974 char buf[100]; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
975 KeySym keySym; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
976 int key; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
977 static XComposeStatus stat; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
978 int e; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
979 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
980 while ( XPending( mDisplay ) ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
981 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
982 XNextEvent( mDisplay,&Event ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
983 if( Event.type == KeyPress ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
984 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
985 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
986 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat ); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
987 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 ) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
988 : ( keySym ) ; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
989 if(gl_handlekey(key)) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
990 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
991 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
992 } else { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
993 XPutBackEvent(mDisplay, &Event); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
994 break; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
995 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
996 } |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
997 e=vo_x11_check_events(mDisplay); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
998 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); |
2124 | 999 } |
1000 | |
1001 static void draw_osd(void) | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1002 { vo_draw_text(image_width,image_height,draw_alpha_fnc); } |
2124 | 1003 |
1004 static void | |
1005 flip_page(void) | |
1006 { | |
1007 | |
1008 drawTextureDisplay(); | |
1009 | |
1010 // glFlush(); | |
1011 glFinish(); | |
1012 glXSwapBuffers( mDisplay,mywindow ); | |
1013 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1014 if(!used_info_done) |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1015 { |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1016 if(used_s) printf("[gl2] using slice method yuv\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1017 if(used_r) printf("[gl2] using frame method rgb\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1018 if(used_b) printf("[gl2] using frame method bgr\n"); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1019 used_info_done=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1020 fflush(0); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1021 } |
2124 | 1022 } |
1023 | |
1024 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) | |
1025 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) | |
1026 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1027 yuv2rgb(ImageData+y*raw_line_len, src[0], src[1], src[2], |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1028 w,h, image_width*image_bytes, stride[0],stride[1]); |
2124 | 1029 |
1030 #ifndef NDEBUG | |
1031 printf("slice: %d/%d -> %d/%d (%dx%d)\n", | |
1032 x, y, x+w-1, y+h-1, w, h); | |
1033 #endif | |
1034 | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1035 used_s=1; |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1036 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1037 setupTextureDirtyArea(x, y, w, h); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1038 |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1039 return 0; |
2124 | 1040 } |
1041 | |
1042 static inline uint32_t | |
1043 draw_frame_x11_bgr(uint8_t *src[]) | |
1044 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1045 resetTexturePointers((unsigned char *)src[0]); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1046 ImageData=(unsigned char *)src[0]; |
2124 | 1047 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1048 // for(i=0;i<image_height;i++) ImageData[image_width*image_bytes*i+20]=128; |
2124 | 1049 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1050 used_b=1; |
2124 | 1051 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1052 setupTextureDirtyArea(0, 0, image_width, image_height); |
2124 | 1053 return 0; |
1054 } | |
1055 | |
1056 static inline uint32_t | |
1057 draw_frame_x11_rgb(uint8_t *src[]) | |
1058 { | |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1059 resetTexturePointers((unsigned char *)src[0]); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1060 ImageData=(unsigned char *)src[0]; |
2124 | 1061 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1062 used_r=1; |
2124 | 1063 |
2276
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1064 setupTextureDirtyArea(0, 0, image_width, image_height); |
558a9397c250
improved gl, please check performance and correct display
sven
parents:
2249
diff
changeset
|
1065 return 0; |
2124 | 1066 } |
1067 | |
1068 | |
1069 static uint32_t | |
1070 draw_frame(uint8_t *src[]) | |
1071 { | |
1072 uint32_t res = 0; | |
1073 | |
1074 if((image_format&IMGFMT_RGB_MASK)==IMGFMT_RGB) | |
1075 res = draw_frame_x11_rgb(src); | |
1076 else | |
1077 res = draw_frame_x11_bgr(src); | |
1078 | |
1079 //flip_page(); | |
1080 return res; | |
1081 } | |
1082 | |
1083 static uint32_t | |
1084 query_format(uint32_t format) | |
1085 { | |
1086 switch(format){ | |
1087 case IMGFMT_YV12: | |
1088 case IMGFMT_RGB|24: | |
1089 case IMGFMT_BGR|24: | |
1090 return 1; | |
1091 } | |
1092 return 0; | |
1093 } | |
1094 | |
1095 | |
1096 static void | |
1097 uninit(void) | |
1098 { | |
1099 saver_on(mDisplay); // screen saver back on | |
4440
0824e6605974
removed obsoleted Terminate_Display_Process, using vo_x11_uninit
alex
parents:
4433
diff
changeset
|
1100 |
0824e6605974
removed obsoleted Terminate_Display_Process, using vo_x11_uninit
alex
parents:
4433
diff
changeset
|
1101 vo_x11_uninit(mDisplay, mywindow); |
2124 | 1102 } |
4352 | 1103 |
1104 static uint32_t preinit(const char *arg) | |
1105 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1106 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
|
1107 { |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1108 printf("[gl2] Unknown subdevice: %s\n",arg); |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1109 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
|
1110 } |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1111 return 0; |
4352 | 1112 } |
1113 | |
4596 | 1114 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 1115 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1116 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1117 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1118 return query_format(*((uint32_t*)data)); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1119 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4440
diff
changeset
|
1120 return VO_NOTIMPL; |
4352 | 1121 } |