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