annotate libvo/vo_gl2.c @ 10218:f82646fc1431

Moved video filters to a separate section, moved slave mode section to the tech subdir, random improvements, default indentation reduced. Straight from the LUG camp Felsberg by Jonas and Diego.
author jonas
date Sat, 31 May 2003 16:41:41 +0000
parents fd3cbeb388f0
children a70a6c12bce5
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
110 static void initTextures()
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");
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
167 exit(1);
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 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
284 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
285
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
286 static void resetTexturePointers(unsigned char *imageSource)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
287 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
288 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
289 struct TexSquare *tsq=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
290 int x=0, y=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
291
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
292 line_1 = (unsigned char *) imageSource;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
293 line_2 = (unsigned char *) imageSource+(image_width*image_bytes);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
294
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
295 mem_start = (unsigned char *) imageSource;
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 for (y = 0; y < texnumy; y++)
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 (x = 0; x < texnumx; x++)
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 tsq = texgrid + y * 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 /* calculate the pixel store data,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
304 to use the machine-bitmap for our texture
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
305 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
306 memory_x_start_offset = 0 * image_bytes +
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
307 x * texture_width * image_bytes;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
308
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
309 tsq->texture = line_1 +
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
310 y * texture_height * raw_line_len +
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
311 memory_x_start_offset;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
312
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
313 } /* for all texnumx */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
314 } /* for all texnumy */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
315 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
316
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
317 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
318 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
319 struct TexSquare *square;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
320 int xi, yi, wd, ht, wh, hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
321 int wdecr, hdecr, xh, yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
322
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
323 wdecr=w; hdecr=h; xh=x; yh=y;
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 for (yi = 0; hdecr>0 && yi < texnumy; yi++)
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 if (yi < texnumy - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
328 ht = texture_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
329 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
330 ht = image_height - texture_height * yi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
331
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
332 xh =x;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
333 wdecr =w;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
334
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
335 for (xi = 0; wdecr>0 && xi < texnumx; xi++)
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 square = texgrid + yi * 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 if (xi < texnumx - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
340 wd = texture_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
341 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
342 wd = image_width - texture_width * xi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
343
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
344 if( 0 <= xh && xh < wd &&
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
345 0 <= yh && yh < ht
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
346 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
347 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
348 square->isDirty=GL_TRUE;
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 wh=(wdecr<wd)?wdecr:wd-xh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
351 if(wh<0) wh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
352
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
353 hh=(hdecr<ht)?hdecr:ht-yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
354 if(hh<0) hh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
355
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
356 /*
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
357 #ifndef NDEBUG
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
358 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
359 xi, yi, xh, yh, wdecr, hdecr, xh, yh, wh, hh);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
360 #endif
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
361 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
362
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
363 if(xh<square->dirtyXoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
364 square->dirtyXoff=xh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
365
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
366 if(yh<square->dirtyYoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
367 square->dirtyYoff=yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
368
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
369 square->dirtyWidth = wd-square->dirtyXoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
370 square->dirtyHeight = ht-square->dirtyYoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
371
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
372 wdecr-=wh;
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 if ( xi == texnumx - 1 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
375 hdecr-=hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
376 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
377
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
378 xh-=wd;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
379 if(xh<0) xh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
380 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
381 yh-=ht;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
382 if(yh<0) yh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
383 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
384 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
385
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
386 static void gl_set_bilinear (int val)
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 int x, y;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
389
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
390 if(val>=0)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
391 gl_bilinear = val;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
392 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
393 gl_bilinear++;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
394
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
395 gl_bilinear=gl_bilinear%2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
396 /* no mipmap yet .. */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
397
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
398 for (y = 0; y < texnumy; y++)
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 (x = 0; x < texnumx; x++)
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 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj);
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 switch (gl_bilinear)
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 case 0:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
407 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
408 GL_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
409 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_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 printf("[gl2] bilinear off\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
412 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
413 case 1:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
414 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
415 GL_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
416 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_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 printf("[gl2] bilinear linear\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
419 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
420 case 2:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
421 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
422 GL_LINEAR_MIPMAP_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
423 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_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 printf("[gl2] bilinear mipmap nearest\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
426 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
427 case 3:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
429 GL_LINEAR_MIPMAP_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
430 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_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 printf("[gl2] bilinear mipmap linear\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
433 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
434 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
435 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
436 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
437 fflush(0);
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
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
440 static void gl_set_antialias (int val)
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 gl_antialias=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 if (gl_antialias)
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 glShadeModel (GL_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
447 glEnable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
448 glEnable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
449 glEnable (GL_POINT_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
450 printf("[gl2] antialiasing on\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
451 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
452 else
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 glShadeModel (GL_FLAT);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
455 glDisable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
456 glDisable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
457 glDisable (GL_POINT_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
458 printf("[gl2] antialiasing off\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
459 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
460 fflush(0);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
461 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
462
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
463
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
464 static void drawTextureDisplay ()
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
465 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
466 struct TexSquare *square;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8148
diff changeset
467 int x, y/*, xoff=0, yoff=0, wd, ht*/;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
468 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
469
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
470 glColor3f(1.0,1.0,1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
471
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
472 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
473 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
474 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
475 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
476 square = texgrid + y * texnumx + x;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
477
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
478 if(square->isTexture==GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
479 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
480 #ifndef NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
481 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
482 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
483 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
484 continue;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
485 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
486
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
487 glBindTexture (GL_TEXTURE_2D, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
488 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
489 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
490 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
491 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
492 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
493 #ifndef NDEBUG
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
494 else if(err==GL_INVALID_OPERATION) {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
495 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
496 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
497 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
498
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
499 if(glIsTexture(square->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
500 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
501 square->isTexture=GL_FALSE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
502 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
503 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
504 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
505
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
506 if(square->isDirty)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
507 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
508 glTexSubImage2D (GL_TEXTURE_2D, 0,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
509 square->dirtyXoff, square->dirtyYoff,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
510 square->dirtyWidth, square->dirtyHeight,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
511 gl_bitmap_format, gl_bitmap_type, square->texture);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
512
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
513 square->isDirty=GL_FALSE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
514 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
515 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
516
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
517 #ifndef NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
518 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
519 x, y, square->dirtyXoff, square->dirtyYoff, square->dirtyWidth, square->dirtyHeight);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
520 #endif
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
521
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
522 glBegin(GL_QUADS);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
523
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
524 glTexCoord2f (0, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
525 glVertex2f (square->fx1, square->fy1);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
526
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
527 glTexCoord2f (0, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
528 glVertex2f (square->fx4, square->fy4);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
529
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
530 glTexCoord2f (square->xcov, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
531 glVertex2f (square->fx3, square->fy3);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
532
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
533 glTexCoord2f (square->xcov, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
534 glVertex2f (square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
535
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
536 glEnd();
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
537 /*
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
538 #ifndef NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
539 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
540 square->fx3, square->fy3, square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
541 #endif
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
542 */
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
543 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
544 } /* for all texnumy */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
545
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
546 /* YES - lets catch this error ...
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
547 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
548 (void) glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
549 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
550
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
551
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
552 static void resize(int x,int y){
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
553 printf("[gl2] Resize: %dx%d\n",x,y);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
554 if( isFullscreen )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
555 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
556 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
557 glViewport( 0, 0, x, y );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
558
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
559 glMatrixMode(GL_PROJECTION);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
560 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
561 glOrtho (0, 1, 1, 0, -1.0, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
562
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
563 glMatrixMode(GL_MODELVIEW);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
564 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
565 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
566
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
567 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
568 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
569 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
570
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
571 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
572 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
573 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
574
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
575 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
576 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
577 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
578
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
579 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
580 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
581 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
582
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
583 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
584 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
585
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
586 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
587 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
588 XVisualInfo template, *vi_list;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
589 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
590
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
591 template.screen = scr;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
592 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
593 if (!vi_list) return -1;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7964
diff changeset
594 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
595 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
596 int val, res, w = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
597 /* 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
598 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
599 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
600 /* also it must be doublebuffered ... */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
601 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
602 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
603 /* 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
604 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
605 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
606 /* prefer less depth buffer size, */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
607 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
608 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
609 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
610 /* stencil buffer size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
611 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
612 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
613 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
614 /* and colorbuffer alpha size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
615 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
616 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
617 w += val;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
618 /* 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
619 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
620 if (w < best_weight) {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
621 best_weight = w;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
622 best_i = i;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
623 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
624 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
625 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
626 XFree(vi_list);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
627 return (best_weight < 1000000) ? 0 : -1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
628 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
629
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
630 /* connect to server, create and map window,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
631 * allocate colors and (shared) memory
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
632 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
633 static uint32_t
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
634 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
635 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
636 // int screen;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
637 unsigned int fg, bg;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
638 XSizeHints hint;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
639 XVisualInfo *vinfo, vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
640 XEvent xev;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
641
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
642 // XGCValues xgcv;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
643 XSetWindowAttributes xswa;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
644 unsigned long xswamask;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
645
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
646 const unsigned char * glVersion;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
647
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
648 image_height = height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
649 image_width = width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
650 image_format = format;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
651
2278
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
652 aspect_save_orig(width,height);
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
653 aspect_save_prescale(d_width,d_height);
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
654 aspect_save_screenres(vo_screenwidth,vo_screenheight);
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
655
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
656 aspect(&d_width,&d_height,A_NOZOOM);
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
657
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
658 if( flags&0x01 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
659 {
2278
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
660 isFullscreen = GL_TRUE;
54874c78af6b aspect changes integrated .., please check performance and conformance
sven
parents: 2276
diff changeset
661 aspect(&d_width,&d_height,A_ZOOM);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
662 hint.x = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
663 hint.y = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
664 hint.width = vo_screenwidth;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
665 hint.height = vo_screenheight;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
666 hint.flags = PPosition | PSize;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
667 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
668 hint.x = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
669 hint.y = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
670 hint.width = d_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
671 hint.height = d_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
672 hint.flags = PPosition | PSize;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
673 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
674
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
675 /* Get some colors */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
676
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
677 bg = WhitePixel(mDisplay, mScreen);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
678 fg = BlackPixel(mDisplay, mScreen);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
679
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
680 /* Make the window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
681
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
682 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
683
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
684 // 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
685 vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
686 if (vinfo == NULL)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
687 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
688 printf("[gl2] no GLX support present\n");
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
689 return -1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
690 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
691
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
692 xswa.background_pixel = 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
693 xswa.border_pixel = 1;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
694 xswa.colormap = vo_x11_create_colormap(vinfo);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
695 xswamask = CWBackPixel | CWBorderPixel | CWColormap;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
696
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
697 if ( vo_window == None )
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
698 {
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
699 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
700
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
701 if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
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 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
704
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
705 /* Tell other applications about this window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
706
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
707 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
708
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
709 /* Map window. */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
710 XMapWindow(mDisplay, vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
711 #ifdef HAVE_XINERAMA
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
712 vo_x11_xinerama_move(mDisplay,vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
713 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
714 XClearWindow(mDisplay,vo_window);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
715
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
716 /* Wait for map. */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
717 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
718 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
719 XNextEvent(mDisplay, &xev);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
720 }
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
721 while (xev.type != MapNotify || xev.xmap.event != vo_window);
2124
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 XSelectInput(mDisplay, vo_window, NoEventMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
724
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
725 }
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
726 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
727
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
728 vo_x11_classhint( mDisplay,vo_window,"gl2" );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
729 vo_hidecursor(mDisplay,vo_window);
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
730
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
731 if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
732
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
733 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
734
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
735 glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
736
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
737 XFlush(mDisplay);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
738 XSync(mDisplay, False);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
739
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
740 //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!!
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6212
diff changeset
741 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
742 | ButtonPressMask | ButtonReleaseMask
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4596
diff changeset
743 );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
744
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
745 glVersion = glGetString(GL_VERSION);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
746
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
747 printf("[gl2] OpenGL Driver Information:\n");
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
748 printf("\tvendor: %s,\n\trenderer %s,\n\tversion %s\n",
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
749 glGetString(GL_VENDOR),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
750 glGetString(GL_RENDERER),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
751 glVersion);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
752
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
753 if(glVersion[0]>'1' ||
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
754 (glVersion[0]=='1' && glVersion[2]>='2') )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
755 isGL12 = GL_TRUE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
756 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
757 isGL12 = GL_FALSE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
758
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
759 if(isGL12)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
760 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
761 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
762 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
763 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
764 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
765
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
766 if(glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz)!=0)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
767 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
768 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
769 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
770 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
771 b_sz=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
772 if(glXGetConfig(mDisplay,vinfo,GLX_ALPHA_SIZE, &a_sz)!=0)
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
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
775 rgb_sz=r_sz+g_sz+b_sz;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
776 if(rgb_sz<=0) rgb_sz=24;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
777
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
778 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
779 gl_internal_format=GL_R3_G3_B2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
780 gl_internal_format_s="GL_R3_G3_B2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
781 } 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
782 gl_internal_format=GL_RGB4;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
783 gl_internal_format_s="GL_RGB4";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
784 } 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
785 gl_internal_format=GL_RGB5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
786 gl_internal_format_s="GL_RGB5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
787 } 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
788 gl_internal_format=GL_RGB8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
789 gl_internal_format_s="GL_RGB8";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
790 } 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
791 gl_internal_format=GL_RGB10;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
792 gl_internal_format_s="GL_RGB10";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
793 } 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
794 gl_internal_format=GL_RGBA2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
795 gl_internal_format_s="GL_RGBA2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
796 } 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
797 gl_internal_format=GL_RGBA4;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
798 gl_internal_format_s="GL_RGBA4";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
799 } 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
800 gl_internal_format=GL_RGB5_A1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
801 gl_internal_format_s="GL_RGB5_A1";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
802 } 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
803 gl_internal_format=GL_RGBA8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
804 gl_internal_format_s="GL_RGBA8";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
805 } 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
806 gl_internal_format=GL_RGB10_A2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
807 gl_internal_format_s="GL_RGB10_A2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
808 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
809 gl_internal_format=GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
810 gl_internal_format_s="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
811 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
812
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
813 #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
814 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
815 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
816 #endif
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
817
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
818 if (IMGFMT_IS_BGR(format))
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
819 {
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
820 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
821 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
822 }
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
823 else
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 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
826 image_bpp=IMGFMT_RGB_DEPTH(format);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
827 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
828
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
829 image_bytes=(image_bpp+7)/8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
830
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
831 draw_alpha_fnc=draw_alpha_null;
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 switch(image_bpp)
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 case 15:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
836 case 16:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
837 if(image_mode!=MODE_BGR)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
838 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
839 gl_bitmap_format = GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
840 gl_bitmap_format_s ="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
841 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
842 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
843 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
844 gl_bitmap_format = GL_BGR;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
845 gl_bitmap_format_s ="GL_BGR";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
846 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
847 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
848 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
849
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
850 if (image_bpp==15)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
851 draw_alpha_fnc=draw_alpha_15;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
852 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
853 draw_alpha_fnc=draw_alpha_16;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
854
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
855 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
856 case 24:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
857 if(image_mode!=MODE_BGR)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
858 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
859 /* RGB888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
860 gl_bitmap_format = GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
861 gl_bitmap_format_s ="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
862 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
863 /* BGR888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
864 gl_bitmap_format = GL_BGR;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
865 gl_bitmap_format_s ="GL_BGR";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
866 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
867 gl_bitmap_type = GL_UNSIGNED_BYTE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
868 gl_bitmap_type_s ="GL_UNSIGNED_BYTE";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
869
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
870 draw_alpha_fnc=draw_alpha_24; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
871 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
872 case 32:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
873 /* RGBA8888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
874 gl_bitmap_format = GL_BGRA;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
875 gl_bitmap_format_s ="GL_BGRA";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
876
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
877 if(image_mode!=MODE_BGR)
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 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
880 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
881 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
882 gl_bitmap_type = GL_UNSIGNED_INT_8_8_8_8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
883 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
884 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
885
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
886 draw_alpha_fnc=draw_alpha_32; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
887 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
888 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
889
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
890 ImageDataLocal=malloc(image_width*image_height*image_bytes);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
891 memset(ImageDataLocal,128,image_width*image_height*image_bytes);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
892
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
893 ImageData=ImageDataLocal;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
894
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
895 texture_width=image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
896 texture_height=image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
897 initTextures();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
898
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
899 glDisable(GL_BLEND);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
900 glDisable(GL_DEPTH_TEST);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
901 glDepthMask(GL_FALSE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
902 glDisable(GL_CULL_FACE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
903
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
904 glPixelStorei (GL_UNPACK_ROW_LENGTH, memory_x_len);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
905
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
906 /**
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
907 * 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
908 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
909 if( (image_width*image_bpp)%8 == 0 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
910 gl_alignment=8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
911 else if( (image_width*image_bpp)%4 == 0 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
912 gl_alignment=4;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
913 else if( (image_width*image_bpp)%2 == 0 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
914 gl_alignment=2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
915 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
916 gl_alignment=1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
917
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
918 glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
919
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
920 glEnable (GL_TEXTURE_2D);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
921
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
922 gl_set_antialias(0);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
923 gl_set_bilinear(1);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
924
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
925 drawTextureDisplay ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
926
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
927 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
928 image_bpp, image_bytes, image_mode==MODE_BGR,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
929 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
930 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
931
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
932 resize(d_width,d_height);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
933
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
934 glClearColor( 0.0f,0.0f,0.0f,0.0f );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
935 glClear( GL_COLOR_BUFFER_BIT );
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
936
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
937 saver_off(mDisplay); // turning off screen saver
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
938
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
939 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
940 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
941
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
942 static int gl_handlekey(int key)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
943 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
944 if(key=='a'||key=='A')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
945 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
946 gl_set_antialias(!gl_antialias);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
947 return 0;
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 else if(key=='b'||key=='B')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
950 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
951 gl_set_bilinear(-1);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
952 return 0;
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 return 1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
955 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
956
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
957 static void check_events(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
958 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
959 XEvent Event;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
960 char buf[100];
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
961 KeySym keySym;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
962 int key;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
963 static XComposeStatus stat;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
964 int e;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
965
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
966 while ( XPending( mDisplay ) )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
967 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
968 XNextEvent( mDisplay,&Event );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
969 if( Event.type == KeyPress )
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
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
972 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
973 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
974 : ( keySym ) ;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
975 if(gl_handlekey(key))
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
976 XPutBackEvent(mDisplay, &Event);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
977 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
978 } else {
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 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
982 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
983 e=vo_x11_check_events(mDisplay);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
984 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
985 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
986
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
987 static void draw_osd(void)
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
988 { vo_draw_text(image_width,image_height,draw_alpha_fnc); }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
989
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
990 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
991 flip_page(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
992 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
993
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
994 drawTextureDisplay();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
995
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
996 // glFlush();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
997 glFinish();
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
998 glXSwapBuffers( mDisplay,vo_window );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
999 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1000
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1001 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1002 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
1003 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1004 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1005 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1006
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1007 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1008 draw_frame_x11_bgr(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1009 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1010 resetTexturePointers((unsigned char *)src[0]);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1011 ImageData=(unsigned char *)src[0];
2124
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 // 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
1014
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1015 setupTextureDirtyArea(0, 0, image_width, image_height);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1016 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1017 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1018
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1019 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1020 draw_frame_x11_rgb(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1021 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1022 resetTexturePointers((unsigned char *)src[0]);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1023 ImageData=(unsigned char *)src[0];
2124
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 setupTextureDirtyArea(0, 0, image_width, image_height);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1026 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1027 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1028
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1029
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1030 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1031 draw_frame(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1032 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1033 uint32_t res = 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1034
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1035 if (IMGFMT_IS_RGB(image_format))
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1036 res = draw_frame_x11_rgb(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1037 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1038 res = draw_frame_x11_bgr(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1039
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1040 return res;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1041 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1042
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1043 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1044 query_format(uint32_t format)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1045 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1046 switch(format){
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1047 case IMGFMT_RGB24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1048 case IMGFMT_BGR24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1049 // case IMGFMT_RGB32:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1050 // case IMGFMT_BGR32:
6212
2001affedb75 query_format revised
alex
parents: 6095
diff changeset
1051 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1052 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1053 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1054 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1055
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1056
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1057 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1058 uninit(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1059 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1060 if ( !vo_config_count ) return;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1061 saver_on(mDisplay); // screen saver back on
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1062 vo_x11_uninit();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1063 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1064
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1065 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1066 {
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
1067 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
1068 {
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
1069 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
1070 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
1071 }
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7763
diff changeset
1072 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
1073 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1074 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1075
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
1076 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1077 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1078 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1079 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1080 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
1081 case VOCTRL_FULLSCREEN:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1082 vo_x11_fullscreen();
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1083 return VO_TRUE;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1084 case VOCTRL_SET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1085 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1086 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1087 int value;
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_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1090 value = va_arg(ap, int);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1091 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1092 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
1093 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1094 case VOCTRL_GET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1095 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1096 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1097 int *value;
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_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1100 value = va_arg(ap, int *);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1101 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1102 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
1103 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1104 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1105 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1106 }