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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1 /*
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
2 * video_out_gl.c, X11/OpenGL interface
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
3 * based on video_out_x11 by Aaron Holtzman,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
4 * and WS opengl window manager by Pontscho/Fresh!
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
5 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
6
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
7 #include <stdio.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
8 #include <stdlib.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
9 #include <string.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
12
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
13 #include "config.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
14 #include "video_out.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
17
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
18 #include <X11/Xlib.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
19 #include <X11/Xutil.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
20 //#include <X11/keysym.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
21 #include <GL/glx.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
22 #include <errno.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
23
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
24 #include <GL/gl.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
25
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
26 #include "x11_common.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
27 #include "aspect.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
28
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
29 #define NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
30 //#undef NDEBUG
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
35 {
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
36 "X11 (OpenGL) - multiple textures version",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
37 "gl2",
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
38 "Arpad Gereoffy & Sven Goethel",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
39 ""
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
40 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
44 /* private prototypes */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
712a46dff92d printf-gcc3 patch, x11-commons mRootwin
sven
parents: 2453
diff changeset
48
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
51 static unsigned char *ImageData=NULL;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
52
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
53 /* X11 related variables */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
54 //static Window vo_window;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
55
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
56 //static int texture_id=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
57
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
58 static GLXContext wsGLXContext;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
59
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
60 static uint32_t image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
61 static uint32_t image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
62 static uint32_t image_format;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
65 static uint32_t image_bytes;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
66
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
67 static uint32_t texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
68 static uint32_t texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
69 static int texnumx, texnumy, memory_x_len, memory_x_start_offset, raw_line_len;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
70 static GLfloat texpercx, texpercy;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
88
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
89 /* The squares that are tiled to make up the game screen polygon */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
90
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
91 struct TexSquare
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
92 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
93 GLubyte *texture;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
94 GLuint texobj;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
95 int isTexture;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
96 GLfloat fx1, fy1, fx2, fy2, fx3, fy3, fx4, fy4;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
100 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
101
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
102 static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
103 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
104 *px=(float)x*texpercx;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
105 if(*px>1.0) *px=1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
106 *py=(float)y*texpercy;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
107 if(*py>1.0) *py=1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
108 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
109
10604
alex
parents: 10143
diff changeset
110 static int initTextures()
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
111 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
112 unsigned char *line_1=0, *line_2=0, *mem_start=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
113 struct TexSquare *tsq=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
114 int e_x, e_y, s, i=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
115 int x=0, y=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
116 GLint format=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
117 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
118
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
119 /* achieve the 2**e_x:=texture_width, 2**e_y:=texture_height */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
120 e_x=0; s=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
121 while (s<texture_width)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
122 { s*=2; e_x++; }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
123 texture_width=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
125 e_y=0; s=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
126 while (s<texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
127 { s*=2; e_y++; }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
128 texture_height=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
129
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
130
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
131 /* Test the max texture size */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
132 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
133 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
138
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
139 glGetTexLevelParameteriv
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
140 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
141
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
142 if (format != gl_internal_format)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
145 texture_height, texture_width);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
146
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
147 if (texture_width > texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
148 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
149 e_x--;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
150 texture_width = 1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
151 for (i = e_x; i > 0; i--)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
152 texture_width *= 2;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
153 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
154 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
155 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
156 e_y--;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
157 texture_height = 1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
158 for (i = e_y; i > 0; i--)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
159 texture_height *= 2;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
160 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
161
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
162 fprintf (stderr, "[%dx%d] !\n", texture_height, texture_width);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
163
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
164 if(texture_width < 64 || texture_height < 64)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
165 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
166 fprintf (stderr, "GLERROR: Give up .. usable texture size not avaiable, or texture config error !\n");
10604
alex
parents: 10143
diff changeset
167 return -1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
168 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
169 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
172
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
173 texnumx = image_width / texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
174 if ((image_width % texture_width) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
175 texnumx++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
176
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
177 texnumy = image_height / texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
178 if ((image_height % texture_height) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
179 texnumy++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
alex
parents: 2732
diff changeset
182 texnumx, texnumy, texture_width,texture_height);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
183
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
184 /* Allocate the texture memory */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
185
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
186 texpercx = (GLfloat) texture_width / (GLfloat) image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
187 if (texpercx > 1.0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
188 texpercx = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
189
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
190 texpercy = (GLfloat) texture_height / (GLfloat) image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
191 if (texpercy > 1.0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
192 texpercy = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
193
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
194 texgrid = (struct TexSquare *)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
195 calloc (texnumx * texnumy, sizeof (struct TexSquare));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
199
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
200 mem_start = (unsigned char *) ImageDataLocal;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
201
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
202 raw_line_len = line_2 - line_1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
203
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
204 memory_x_len = raw_line_len / image_bytes;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
205
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
208 (int) texnumx, (int) texture_width, (int) texnumy,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
209 (int) texture_height);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
210 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
211
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
212 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
213 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
214 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
215 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
216 tsq = texgrid + y * texnumx + x;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
217
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
218 if (x == texnumx - 1 && image_width % texture_width)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
219 tsq->xcov =
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
220 (GLfloat) (image_width % texture_width) / (GLfloat) texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
221 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
222 tsq->xcov = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
223
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
224 if (y == texnumy - 1 && image_height % texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
225 tsq->ycov =
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
226 (GLfloat) (image_height % texture_height) / (GLfloat) texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
227 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
228 tsq->ycov = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
229
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
230 CalcFlatPoint (x, y, &(tsq->fx1), &(tsq->fy1));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
231 CalcFlatPoint (x + 1, y, &(tsq->fx2), &(tsq->fy2));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
232 CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
233 CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
234
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
235 /* calculate the pixel store data,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
236 to use the machine-bitmap for our texture
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
237 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
238 memory_x_start_offset = 0 * image_bytes +
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
239 x * texture_width * image_bytes;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
240
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
241 tsq->texture = line_1 +
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
242 y * texture_height * raw_line_len +
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
243 memory_x_start_offset;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
244
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
245 tsq->isDirty=GL_TRUE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
246 tsq->isTexture=GL_FALSE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
249
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
250 glGenTextures (1, &(tsq->texobj));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
251
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
252 glBindTexture (GL_TEXTURE_2D, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
253 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
254 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
255 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
256 fprintf (stderr, "GLERROR glBindTexture (glGenText) := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
257 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
258
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
259 if(glIsTexture(tsq->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
260 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
261 fprintf (stderr, "GLERROR ain't a texture (glGenText): texnum x=%d, y=%d, texture=%d\n",
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
262 x, y, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
263 } else {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
264 tsq->isTexture=GL_TRUE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
265 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
266
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
272 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
273
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
274 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
275 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
276
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
277 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
278 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
279
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
280 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
281
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
282 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
283 } /* for all texnumy */
10604
alex
parents: 10143
diff changeset
284
alex
parents: 10143
diff changeset
285 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
286 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
466 static void drawTextureDisplay ()
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
467 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
470 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
471
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
472 glColor3f(1.0,1.0,1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
473
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
474 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
475 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
476 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
477 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
478 square = texgrid + y * texnumx + x;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
479
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
480 if(square->isTexture==GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
481 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
484 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
485 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
486 continue;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
487 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
488
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
489 glBindTexture (GL_TEXTURE_2D, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
490 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
491 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
492 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
493 fprintf (stderr, "GLERROR glBindTexture := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
494 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
495 #ifndef NDEBUG
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
496 else if(err==GL_INVALID_OPERATION) {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
497 fprintf (stderr, "GLERROR glBindTexture := GL_INVALID_OPERATION, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
498 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
499 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
500
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
501 if(glIsTexture(square->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
502 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
503 square->isTexture=GL_FALSE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
504 fprintf (stderr, "GLERROR ain't a texture(update): texnum x=%d, y=%d, texture=%d\n",
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
505 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
506 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
518
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
522 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
523
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
524 glBegin(GL_QUADS);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
525
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
526 glTexCoord2f (0, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
527 glVertex2f (square->fx1, square->fy1);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
528
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
529 glTexCoord2f (0, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
530 glVertex2f (square->fx4, square->fy4);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
531
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
532 glTexCoord2f (square->xcov, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
533 glVertex2f (square->fx3, square->fy3);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
534
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
535 glTexCoord2f (square->xcov, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
536 glVertex2f (square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
542 square->fx3, square->fy3, square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
543 #endif
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
544 */
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
545 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
546 } /* for all texnumy */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
547
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
548 /* YES - lets catch this error ...
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
549 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
550 (void) glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
551 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
552
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
553
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
560
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
561 glMatrixMode(GL_PROJECTION);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
562 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
563 glOrtho (0, 1, 1, 0, -1.0, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
564
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
565 glMatrixMode(GL_MODELVIEW);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
566 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
567 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
632 /* connect to server, create and map window,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
633 * allocate colors and (shared) memory
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
634 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
637 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
638 // int screen;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
639 unsigned int fg, bg;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
642 XEvent xev;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
643
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
644 // XGCValues xgcv;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
645 XSetWindowAttributes xswa;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
646 unsigned long xswamask;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
650 image_height = height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
651 image_width = width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
652 image_format = format;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
675 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
676
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
677 /* Get some colors */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
678
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
679 bg = WhitePixel(mDisplay, mScreen);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
680 fg = BlackPixel(mDisplay, mScreen);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
681
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
682 /* Make the window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
683
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
684 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
685
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
688 if (vinfo == NULL)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
691 return -1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
692 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
693
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
694 xswa.background_pixel = 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
697 xswamask = CWBackPixel | CWBorderPixel | CWColormap;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
698
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
699 if ( vo_window == None )
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
700 {
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
702
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
703 if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
704
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
705 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
706
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
707 /* Tell other applications about this window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
710
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
711 /* Map window. */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
712 XMapWindow(mDisplay, vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
713 #ifdef HAVE_XINERAMA
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
714 vo_x11_xinerama_move(mDisplay,vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
715 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
716 XClearWindow(mDisplay,vo_window);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
717
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
718 /* Wait for map. */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
719 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
720 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
721 XNextEvent(mDisplay, &xev);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
722 }
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
723 while (xev.type != MapNotify || xev.xmap.event != vo_window);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
724
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
725 XSelectInput(mDisplay, vo_window, NoEventMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
726
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
727 }
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
728 else if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
729
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
730 vo_x11_classhint( mDisplay,vo_window,"gl2" );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
731 vo_hidecursor(mDisplay,vo_window);
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
732
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
733 if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
734
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
735 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
736
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
737 glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
738
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
739 XFlush(mDisplay);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
740 XSync(mDisplay, False);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
741
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
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
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4596
diff changeset
744 | ButtonPressMask | ButtonReleaseMask
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4596
diff changeset
745 );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
829 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
896
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
897 texture_width=image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
898 texture_height=image_height;
10604
alex
parents: 10143
diff changeset
899 if (initTextures() < 0)
alex
parents: 10143
diff changeset
900 return -1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
901
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
902 glDisable(GL_BLEND);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
903 glDisable(GL_DEPTH_TEST);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
904 glDepthMask(GL_FALSE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
905 glDisable(GL_CULL_FACE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
906
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
923 glEnable (GL_TEXTURE_2D);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
928 drawTextureDisplay ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
934
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
935 resize(d_width,d_height);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
938 glClear( GL_COLOR_BUFFER_BIT );
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
939
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
940 saver_off(mDisplay); // turning off screen saver
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
941
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
942 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
943 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
959
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
960 static void check_events(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
988 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
989
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
992
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
993 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
994 flip_page(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
995 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
996
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
997 drawTextureDisplay();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
998
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
999 // glFlush();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1000 glFinish();
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1001 glXSwapBuffers( mDisplay,vo_window );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1002 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1003
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1004 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1005 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1006 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1007 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1008 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1009
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1010 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1011 draw_frame_x11_bgr(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1019 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1020 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1021
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1022 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1023 draw_frame_x11_rgb(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1030 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1031
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1032
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1033 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1034 draw_frame(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1035 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1036 uint32_t res = 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1039 res = draw_frame_x11_rgb(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1040 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1041 res = draw_frame_x11_bgr(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1042
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1043 return res;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1044 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1045
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1046 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1047 query_format(uint32_t format)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1048 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
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
2001affedb75 query_format revised
alex
parents: 6095
diff changeset
1054 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1055 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1056 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1057 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1058
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1059
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1060 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1061 uninit(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1062 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1063 if ( !vo_config_count ) return;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1064 saver_on(mDisplay); // screen saver back on
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1065 vo_x11_uninit();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1066 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1067
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1068 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
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
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7763
diff changeset
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
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1077 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1078
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
1079 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
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
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1109 }