annotate libvo/vo_gl2.c @ 8254:772d6d27fd66

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