annotate libvo/vo_gl2.c @ 12895:3cd9add91f97

removed saver_on, saver_off calls, they are already in x11_common.c
author reimar
date Sun, 25 Jul 2004 12:49:01 +0000
parents 010a28a43c9f
children 02c0d4371573
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1 /*
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
2 * video_out_gl.c, X11/OpenGL interface
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
3 * based on video_out_x11 by Aaron Holtzman,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
4 * and WS opengl window manager by Pontscho/Fresh!
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
5 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
6
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
7 #include <stdio.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
8 #include <stdlib.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
9 #include <string.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
10 #include <math.h>
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
11 #include <errno.h>
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
12
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
13 #include "config.h"
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
14 #include "mp_msg.h"
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
15 #include "video_out.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
16 #include "video_out_internal.h"
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7964
diff changeset
17 #include "sub.h"
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
18
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
19 #ifdef HAVE_NEW_GUI
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
20 #include "../Gui/interface.h"
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
21 #endif
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
22
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
23 #include <GL/gl.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
24 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
25 #include <windows.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
26 #include <GL/glext.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
27 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
28 #include <X11/Xlib.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
29 #include <X11/Xutil.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
30 #include <GL/glx.h>
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
31 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
32 #include <errno.h>
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
33
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
34 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
35 #include "w32_common.h"
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
36 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
37 #include "x11_common.h"
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
38 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
39 #include "aspect.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
40
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
41 #define NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
42 //#undef NDEBUG
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
43
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
44 #undef TEXTUREFORMAT_ALWAYS
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
45 #undef TEXTUREFORMAT_ALWAYS_S
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
46 #ifdef SYS_DARWIN
12842
5ab2ea430653 use RGB32 textures on OS X
reimar
parents: 12762
diff changeset
47 #define TEXTUREFORMAT_ALWAYS GL_RGBA8
5ab2ea430653 use RGB32 textures on OS X
reimar
parents: 12762
diff changeset
48 #define TEXTUREFORMAT_ALWAYS_S "GL_RGBA8"
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
49 #endif
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
50
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
51 static vo_info_t info =
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
52 {
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
53 "X11 (OpenGL) - multiple textures version",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
54 "gl2",
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
55 "Arpad Gereoffy & Sven Goethel",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
56 ""
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
57 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
58
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
59 LIBVO_EXTERN(gl2)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
60
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
61 /* private prototypes */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
62
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
63 #define MODE_BGR 1
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
64 #define MODE_RGB 0
2455
712a46dff92d printf-gcc3 patch, x11-commons mRootwin
sven
parents: 2453
diff changeset
65
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
66 /* local data */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
67 static unsigned char *ImageData=NULL;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
68
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
69 /* X11 related variables */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
70 //static Window vo_window;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
71
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
72 //static int texture_id=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
73
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
74 #ifndef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
75 static GLXContext wsGLXContext;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
76 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
77
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
78 static uint32_t image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
79 static uint32_t image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
80 static uint32_t image_format;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
81 static uint32_t image_bpp;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
82 static int image_mode;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
83 static uint32_t image_bytes;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
84
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
85 static int int_pause;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
86
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
87 static uint32_t texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
88 static uint32_t texture_height;
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
89 static int texnumx, texnumy, raw_line_len;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
90 static GLfloat texpercx, texpercy;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
91 static struct TexSquare * texgrid;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
92 static GLint gl_internal_format;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
93 static char * gl_internal_format_s;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
94 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
95 static GLint gl_bitmap_format;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
96 static char * gl_bitmap_format_s;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
97 static GLint gl_bitmap_type;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
98 static char * gl_bitmap_type_s;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
99 static int gl_alignment;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
100 static int isGL12 = GL_FALSE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
101
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
102 static int gl_bilinear=1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
103 static int gl_antialias=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
104
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
105 static void (*draw_alpha_fnc)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
106 (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
107
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
108
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
109 /* The squares that are tiled to make up the game screen polygon */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
110
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
111 struct TexSquare
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
112 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
113 GLubyte *texture;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
114 GLuint texobj;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
115 int isTexture;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
116 GLfloat fx1, fy1, fx2, fy2, fx3, fy3, fx4, fy4;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
117 GLfloat xcov, ycov;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
118 int isDirty;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
119 int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
120 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
121
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
122 static void resetTexturePointers(unsigned char *imageSource);
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
123
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
124 static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
125 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
126 *px=(float)x*texpercx;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
127 if(*px>1.0) *px=1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
128 *py=(float)y*texpercy;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
129 if(*py>1.0) *py=1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
130 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
131
10604
alex
parents: 10143
diff changeset
132 static int initTextures()
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
133 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
134 struct TexSquare *tsq=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
135 int e_x, e_y, s, i=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
136 int x=0, y=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
137 GLint format=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
138 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
139
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
140 /* achieve the 2**e_x:=texture_width, 2**e_y:=texture_height */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
141 e_x=0; s=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
142 while (s<texture_width)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
143 { s*=2; e_x++; }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
144 texture_width=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
145
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
146 e_y=0; s=1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
147 while (s<texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
148 { s*=2; e_y++; }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
149 texture_height=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
150
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
151
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
152 /* Test the max texture size */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
153 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
154 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
155 glTexImage2D (GL_PROXY_TEXTURE_2D, 0,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
156 gl_internal_format,
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
157 texture_width, texture_height,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
158 0, gl_bitmap_format, gl_bitmap_type, NULL);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
159
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
160 glGetTexLevelParameteriv
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
161 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
162
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
163 if (format != gl_internal_format)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
164 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
165 mp_msg (MSGT_VO, MSGL_V, "[gl2] Needed texture [%dx%d] too big, trying ",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
166 texture_height, texture_width);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
167
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
168 if (texture_width > texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
169 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
170 e_x--;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
171 texture_width = 1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
172 for (i = e_x; i > 0; i--)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
173 texture_width *= 2;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
174 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
175 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
176 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
177 e_y--;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
178 texture_height = 1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
179 for (i = e_y; i > 0; i--)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
180 texture_height *= 2;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
181 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
182
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
183 mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_height, texture_width);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
184
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
185 if(texture_width < 64 || texture_height < 64)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
186 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
187 mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not avaiable, or texture config error !\n");
10604
alex
parents: 10143
diff changeset
188 return -1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
189 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
190 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
191 }
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
192 while (format != gl_internal_format && texture_width > 1 && texture_height > 1);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
193
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
194 texnumx = image_width / texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
195 if ((image_width % texture_width) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
196 texnumx++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
197
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
198 texnumy = image_height / texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
199 if ((image_height % texture_height) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
200 texnumy++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
201
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
202 mp_msg(MSGT_VO, MSGL_V, "[gl2] Creating %dx%d textures of size %dx%d ...\n",
3564
alex
parents: 2732
diff changeset
203 texnumx, texnumy, texture_width,texture_height);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
204
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
205 /* Allocate the texture memory */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
206
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
207 texpercx = (GLfloat) texture_width / (GLfloat) image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
208 if (texpercx > 1.0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
209 texpercx = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
210
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
211 texpercy = (GLfloat) texture_height / (GLfloat) image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
212 if (texpercy > 1.0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
213 texpercy = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
214
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
215 texgrid = (struct TexSquare *)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
216 calloc (texnumx * texnumy, sizeof (struct TexSquare));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
217
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
218 raw_line_len = image_width * image_bytes;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
219
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
220 mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
221 (int) texnumx, (int) texture_width, (int) texnumy,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
222 (int) texture_height);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
223
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
224 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
225 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
226 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
227 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
228 tsq = texgrid + y * texnumx + x;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
229
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
230 if (x == texnumx - 1 && image_width % texture_width)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
231 tsq->xcov =
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
232 (GLfloat) (image_width % texture_width) / (GLfloat) texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
233 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
234 tsq->xcov = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
235
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
236 if (y == texnumy - 1 && image_height % texture_height)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
237 tsq->ycov =
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
238 (GLfloat) (image_height % texture_height) / (GLfloat) texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
239 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
240 tsq->ycov = 1.0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
241
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
242 CalcFlatPoint (x, y, &(tsq->fx1), &(tsq->fy1));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
243 CalcFlatPoint (x + 1, y, &(tsq->fx2), &(tsq->fy2));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
244 CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
245 CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
246
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
247 tsq->isDirty=GL_TRUE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
248 tsq->isTexture=GL_FALSE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
249 tsq->texobj=0;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
250 tsq->dirtyXoff=0; tsq->dirtyYoff=0; tsq->dirtyWidth=-1; tsq->dirtyHeight=-1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
251
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
252 glGenTextures (1, &(tsq->texobj));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
253
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
254 glBindTexture (GL_TEXTURE_2D, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
255 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
256 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
257 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
258 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR glBindTexture (glGenText) := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, tsq->texobj);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
259 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
260
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
261 if(glIsTexture(tsq->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
262 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
263 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR ain't a texture (glGenText): texnum x=%d, y=%d, texture=%d\n",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
264 x, y, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
265 } else {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
266 tsq->isTexture=GL_TRUE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
267 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
268
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
269 glTexImage2D (GL_TEXTURE_2D, 0,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
270 gl_internal_format,
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
271 texture_width, texture_height,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
272 0, gl_bitmap_format, gl_bitmap_type, NULL);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
273
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
274 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
275
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
276 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
277 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
278
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
279 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
280 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
281
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
282 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
283
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
284 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
285 } /* for all texnumy */
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
286 resetTexturePointers (ImageData);
10604
alex
parents: 10143
diff changeset
287
alex
parents: 10143
diff changeset
288 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
289 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
290
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
291 static void resetTexturePointers(unsigned char *imageSource)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
292 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
293 unsigned char *texdata_start, *line_start;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
294 struct TexSquare *tsq = texgrid;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
295 int x=0, y=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
296
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
297 line_start = (unsigned char *) imageSource;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
298
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
299 for (y = 0; y < texnumy; y++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
300 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
301 texdata_start = line_start;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
302 for (x = 0; x < texnumx; x++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
303 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
304 tsq->texture = texdata_start;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
305 texdata_start += texture_width * image_bytes;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
306 tsq++;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
307 } /* for all texnumx */
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
308 line_start += texture_height * raw_line_len;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
309 } /* for all texnumy */
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
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
312 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
313 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
314 struct TexSquare *square;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
315 int xi, yi, wd, ht, wh, hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
316 int wdecr, hdecr, xh, yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
317
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
318 wdecr=w; hdecr=h; xh=x; yh=y;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
319
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
320 for (yi = 0; hdecr>0 && yi < texnumy; yi++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
321 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
322 if (yi < texnumy - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
323 ht = texture_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
324 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
325 ht = image_height - texture_height * yi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
326
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
327 xh =x;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
328 wdecr =w;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
329
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
330 for (xi = 0; wdecr>0 && xi < texnumx; xi++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
331 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
332 square = texgrid + yi * texnumx + xi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
333
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
334 if (xi < texnumx - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
335 wd = texture_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
336 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
337 wd = image_width - texture_width * xi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
338
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
339 if( 0 <= xh && xh < wd &&
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
340 0 <= yh && yh < ht
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
341 )
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 square->isDirty=GL_TRUE;
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 wh=(wdecr<wd)?wdecr:wd-xh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
346 if(wh<0) wh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
347
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
348 hh=(hdecr<ht)?hdecr:ht-yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
349 if(hh<0) hh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
350
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
351 /*
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
352 #ifndef NDEBUG
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
353 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
354 xi, yi, xh, yh, wdecr, hdecr, xh, yh, wh, hh);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
355 #endif
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
356 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
357
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
358 if(xh<square->dirtyXoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
359 square->dirtyXoff=xh;
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 if(yh<square->dirtyYoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
362 square->dirtyYoff=yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
363
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
364 square->dirtyWidth = wd-square->dirtyXoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
365 square->dirtyHeight = ht-square->dirtyYoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
366
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
367 wdecr-=wh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
368
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
369 if ( xi == texnumx - 1 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
370 hdecr-=hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
371 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
372
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
373 xh-=wd;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
374 if(xh<0) xh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
375 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
376 yh-=ht;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
377 if(yh<0) yh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
378 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
379 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
380
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
381 static void gl_set_bilinear (int val)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
382 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
383 int x, y;
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 if(val>=0)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
386 gl_bilinear = val;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
387 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
388 gl_bilinear++;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
389
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
390 gl_bilinear=gl_bilinear%2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
391 /* no mipmap yet .. */
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 for (y = 0; y < texnumy; y++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
394 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
395 for (x = 0; x < texnumx; x++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
396 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
397 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
398
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
399 switch (gl_bilinear)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
400 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
401 case 0:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
402 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
403 GL_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
404 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
405 GL_NEAREST);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
406 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear off\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
407 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
408 case 1:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
409 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
410 GL_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
411 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
412 GL_LINEAR);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
413 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear linear\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
414 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
415 case 2:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
416 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
417 GL_LINEAR_MIPMAP_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
418 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
419 GL_LINEAR_MIPMAP_NEAREST);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
420 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap nearest\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
421 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
422 case 3:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
423 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
424 GL_LINEAR_MIPMAP_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
425 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
426 GL_LINEAR_MIPMAP_LINEAR);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
427 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap linear\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
428 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
429 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
430 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
431 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
432 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
433
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
434 static void gl_set_antialias (int val)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
435 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
436 gl_antialias=val;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
437
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
438 if (gl_antialias)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
439 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
440 glShadeModel (GL_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
441 glEnable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
442 glEnable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
443 glEnable (GL_POINT_SMOOTH);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
444 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing on\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
445 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
446 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
447 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
448 glShadeModel (GL_FLAT);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
449 glDisable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
450 glDisable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
451 glDisable (GL_POINT_SMOOTH);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
452 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing off\n");
2276
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 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
455
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
456
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
457 static void drawTextureDisplay ()
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
458 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
459 struct TexSquare *square;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8148
diff changeset
460 int x, y/*, xoff=0, yoff=0, wd, ht*/;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
461 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
462
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
463 glColor3f(1.0,1.0,1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
464
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
465 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
466 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
467 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
468 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
469 square = texgrid + y * texnumx + x;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
470
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
471 if(square->isTexture==GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
472 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
473 mp_msg (MSGT_VO, MSGL_V, "[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
474 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
475 continue;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
476 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
477
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
478 glBindTexture (GL_TEXTURE_2D, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
479 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
480 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
481 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
482 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR glBindTexture := GL_INVALID_ENUM, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
483 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
484 else if(err==GL_INVALID_OPERATION) {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
485 mp_msg (MSGT_VO, MSGL_V, "GLERROR glBindTexture := GL_INVALID_OPERATION, texnum x=%d, y=%d, texture=%d\n", x, y, square->texobj);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
486 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
487
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
488 if(glIsTexture(square->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
489 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
490 square->isTexture=GL_FALSE;
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
491 mp_msg (MSGT_VO, MSGL_ERR, "GLERROR ain't a texture(update): texnum x=%d, y=%d, texture=%d\n",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
492 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
493 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
494
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
495 if(square->isDirty)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
496 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
497 glTexSubImage2D (GL_TEXTURE_2D, 0,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
498 square->dirtyXoff, square->dirtyYoff,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
499 square->dirtyWidth, square->dirtyHeight,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
500 gl_bitmap_format, gl_bitmap_type, square->texture);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
501
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
502 square->isDirty=GL_FALSE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
503 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
504 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
505
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
506 mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] glTexSubImage2D texnum x=%d, y=%d, %d/%d - %d/%d\n",
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
507 x, y, square->dirtyXoff, square->dirtyYoff, square->dirtyWidth, square->dirtyHeight);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
508
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
509 glBegin(GL_QUADS);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
510
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
511 glTexCoord2f (0, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
512 glVertex2f (square->fx1, square->fy1);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
513
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
514 glTexCoord2f (0, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
515 glVertex2f (square->fx4, square->fy4);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
516
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
517 glTexCoord2f (square->xcov, square->ycov);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
518 glVertex2f (square->fx3, square->fy3);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
519
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
520 glTexCoord2f (square->xcov, 0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
521 glVertex2f (square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
522
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
523 glEnd();
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
524 /*
2124
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] 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
527 square->fx3, square->fy3, square->fx2, square->fy2);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
528 #endif
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
529 */
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
530 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
531 } /* for all texnumy */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
532
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10919
diff changeset
533 /* YES - let's catch this error ...
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
534 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
535 (void) glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
536 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
537
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
538
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
539 static void resize(int *x,int *y){
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
540 mp_msg(MSGT_VO,MSGL_V,"[gl2] Resize: %dx%d\n",*x,*y);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
541 if( vo_fs )
10905
f448dcd93e6d dont fix things at the wrong place
attila
parents: 10902
diff changeset
542 {
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
543 glClear(GL_COLOR_BUFFER_BIT);
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
544 aspect(x, y, A_ZOOM);
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
545 glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y);
10905
f448dcd93e6d dont fix things at the wrong place
attila
parents: 10902
diff changeset
546 } else {
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
547 //aspect(x, y, A_NOZOOM);
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
548 glViewport( 0, 0, *x, *y );
10905
f448dcd93e6d dont fix things at the wrong place
attila
parents: 10902
diff changeset
549 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
550
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
551 glMatrixMode(GL_PROJECTION);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
552 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
553 glOrtho (0, 1, 1, 0, -1.0, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
554
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
555 glMatrixMode(GL_MODELVIEW);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
556 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
557 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
558
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
559 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
560 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
561 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
562
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
563 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
564 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
565 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
566
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
567 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
568 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
569 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
570
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
571 static void draw_alpha_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
572 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
573 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
574
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
575 static void draw_alpha_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
576 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
577
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
578 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
579
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
580 static int config_w32(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
581 PIXELFORMATDESCRIPTOR pfd;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
582 int pf;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
583
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
584 o_dwidth = d_width;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
585 o_dheight = d_height;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
586 vo_fs = flags & VOFLAG_FULLSCREEN;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
587 vo_vm = flags & VOFLAG_MODESWITCHING;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
588
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
589 vo_dwidth = d_width;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
590 vo_dheight = d_height;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
591
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
592 destroyRenderingContext();
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
593 if (!createRenderingContext())
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
594 return -1;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
595
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
596 if (vo_fs)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
597 aspect(&d_width, &d_height, A_ZOOM);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
598
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
599 pf = GetPixelFormat(vo_hdc);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
600 if (!DescribePixelFormat(vo_hdc, pf, sizeof pfd, &pfd)) {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
601 r_sz = g_sz = b_sz = a_sz = 0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
602 } else {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
603 r_sz = pfd.cRedBits;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
604 g_sz = pfd.cGreenBits;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
605 b_sz = pfd.cBlueBits;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
606 a_sz = pfd.cAlphaBits;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
607 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
608
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
609 return 0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
610 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
611
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
612 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
613
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
614 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
615 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
616 XVisualInfo template, *vi_list;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
617 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
618
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
619 template.screen = scr;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
620 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
621 if (!vi_list) return -1;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7964
diff changeset
622 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
623 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
624 int val, res, w = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
625 /* 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
626 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
627 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
628 /* also it must be doublebuffered ... */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
629 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
630 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
631 /* 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
632 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
633 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
634 /* prefer less depth buffer size, */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
635 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
636 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
637 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
638 /* stencil buffer size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
639 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
640 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
641 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
642 /* and colorbuffer alpha size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
643 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
644 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
645 w += val;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
646 /* 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
647 if (vi_list[i].class != DirectColor) w += 100;
12709
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
648
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
649 // avoid bad-looking visual with less that 8bit per color
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
650 res = glXGetConfig(dpy, vi_list + i, GLX_RED_SIZE, &val);
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
651 if (res) continue;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
652 if (val < 8) w += 50;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
653 res = glXGetConfig(dpy, vi_list + i, GLX_GREEN_SIZE, &val);
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
654 if (res) continue;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
655 if (val < 8) w += 70;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
656 res = glXGetConfig(dpy, vi_list + i, GLX_BLUE_SIZE, &val);
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
657 if (res) continue;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
658 if (val < 8) w += 50;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
659
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
660 if (w < best_weight) {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
661 best_weight = w;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
662 best_i = i;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
663 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
664 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
665 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
666 XFree(vi_list);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
667 return (best_weight < 1000000) ? 0 : -1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
668 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
669
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
670 static int config_glx(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
671 XSizeHints hint;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
672 XVisualInfo *vinfo, vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
673 XEvent xev;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
674
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
675 hint.x = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
676 hint.y = 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
677 hint.width = d_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
678 hint.height = d_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
679 hint.flags = PPosition | PSize;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
680
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
681 /* Make the window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
682
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
683 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
684
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
685 // 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
686 vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
687 if (vinfo == NULL)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
688 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
689 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] no GLX support present\n");
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
690 return -1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
691 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
692
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
693 if ( vo_window == None )
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
694 {
12035
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
695 vo_fs = VO_FALSE;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
696 vo_window = vo_x11_create_smooth_window(mDisplay, RootWindow(mDisplay,mScreen),
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
697 vinfo->visual, hint.x, hint.y, hint.width, hint.height, vinfo->depth, vo_x11_create_colormap(vinfo));
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
698
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
699 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
700
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
701 /* Tell other applications about this window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
702
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
703 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
704
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
705 /* Map window. */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
706 XMapWindow(mDisplay, vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
707 #ifdef HAVE_XINERAMA
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
708 vo_x11_xinerama_move(mDisplay,vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3564
diff changeset
709 #endif
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
710 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
711 XClearWindow(mDisplay,vo_window);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
712
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
713 /* Wait for map. */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
714 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
715 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
716 XNextEvent(mDisplay, &xev);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
717 }
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
718 while (xev.type != MapNotify || xev.xmap.event != vo_window);
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
719 }
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
720 else {
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
721 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
12035
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
722 // for changing from fullscreen to fullscreen we do fullscreen to
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
723 // window and back to fullscreen, so that vo_x11_fullscreen saves
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
724 // the correct size for _this_ video (and doesn't take the values from
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
725 // the previous one)
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
726 if (vo_fs)
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
727 vo_x11_fullscreen ();
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
728 XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
729 }
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
730
12035
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
731 // these would normally be set by the event handler, but here we have to
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
732 // do it manually
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
733 vo_dwidth = d_width;
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
734 vo_dheight = d_height;
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
735
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
736 if (flags & VOFLAG_FULLSCREEN)
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
737 vo_x11_fullscreen();
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
738
7763
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
739 vo_x11_classhint( mDisplay,vo_window,"gl2" );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
740 vo_hidecursor(mDisplay,vo_window);
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
741
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
742 if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
743
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
744 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
745
cdb43addad4c -fixed-vo support
pontscho
parents: 7124
diff changeset
746 glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
747
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
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
752 | ButtonPressMask | ButtonReleaseMask | ExposureMask
4658
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
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
755 if(glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz)!=0)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
756 r_sz=0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
757 if(glXGetConfig(mDisplay,vinfo,GLX_GREEN_SIZE, &g_sz)!=0)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
758 g_sz=0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
759 if(glXGetConfig(mDisplay,vinfo,GLX_BLUE_SIZE, &b_sz)!=0)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
760 b_sz=0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
761 if(glXGetConfig(mDisplay,vinfo,GLX_ALPHA_SIZE, &a_sz)!=0)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
762 a_sz=0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
763
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
764 return 0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
765 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
766
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
767 #ifdef HAVE_NEW_GUI
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
768 static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
769 XWindowAttributes xw_attr;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
770 XVisualInfo *vinfo, vinfo_template;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
771 int tmp;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
772 vo_dwidth = d_width;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
773 vo_dheight = d_height;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
774 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
775 XGetWindowAttributes(mDisplay, vo_window, &xw_attr);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
776 vinfo_template.visualid=XVisualIDFromVisual(xw_attr.visual);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
777 vinfo = XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
778
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
779 if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
780 wsGLXContext = glXCreateContext( mDisplay,vinfo,NULL,True );
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
781 if (wsGLXContext == NULL) {
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
782 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Could not create GLX context!\n");
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
783 XFree(vinfo);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
784 return -1;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
785 }
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
786 glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
787 XSync(mDisplay, False);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
788
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
789 if (glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
790 if (glXGetConfig(mDisplay,vinfo,GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
791 if (glXGetConfig(mDisplay,vinfo,GLX_BLUE_SIZE, &b_sz) != 0) b_sz = 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
792 if (glXGetConfig(mDisplay,vinfo,GLX_ALPHA_SIZE, &a_sz) != 0) a_sz = 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
793 XFree(vinfo);
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
794 return 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
795 }
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
796 #endif
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
797
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
798 #endif
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
799
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
800 static int initGl(uint32_t d_width, uint32_t d_height)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
801 {
12446
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
802 ImageData=malloc(image_width*image_height*image_bytes);
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
803 memset(ImageData,128,image_width*image_height*image_bytes);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
804
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
805 texture_width=image_width;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
806 texture_height=image_height;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
807
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
808 if (initTextures() < 0)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
809 return -1;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
810
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
811 glDisable(GL_BLEND);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
812 glDisable(GL_DEPTH_TEST);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
813 glDepthMask(GL_FALSE);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
814 glDisable(GL_CULL_FACE);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
815
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
816 glPixelStorei (GL_UNPACK_ROW_LENGTH, image_width);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
817
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
818 /**
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
819 * may give a little speed up for a kinda burst read ..
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
820 */
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
821 if( (image_width*image_bpp)%8 == 0 )
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
822 gl_alignment=8;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
823 else if( (image_width*image_bpp)%4 == 0 )
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
824 gl_alignment=4;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
825 else if( (image_width*image_bpp)%2 == 0 )
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
826 gl_alignment=2;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
827 else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
828 gl_alignment=1;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
829
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
830 glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
831
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
832 glEnable (GL_TEXTURE_2D);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
833
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
834 gl_set_antialias(0);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
835 gl_set_bilinear(1);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
836
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
837 drawTextureDisplay ();
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
838
12446
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
839 free (ImageData);
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
840 ImageData = NULL;
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
841
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
842 mp_msg(MSGT_VO, MSGL_V, "[gl2] Using image_bpp=%d, image_bytes=%d, isBGR=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\tgl_alignment=%d, rgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n",
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
843 image_bpp, image_bytes, image_mode==MODE_BGR,
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
844 gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment,
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
845 rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
846
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
847 resize(&d_width, &d_height);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
848
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
849 glClearColor( 0.0f,0.0f,0.0f,0.0f );
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
850 glClear( GL_COLOR_BUFFER_BIT );
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
851
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
852 return 0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
853 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
854
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
855 /* connect to server, create and map window,
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
856 * allocate colors and (shared) memory
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
857 */
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
858 static uint32_t
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
859 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
860 {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
861 const unsigned char * glVersion;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
862
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
863 image_height = height;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
864 image_width = width;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
865 image_format = format;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
866
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
867 int_pause = 0;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
868
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
869 aspect_save_orig(width,height);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
870 aspect_save_prescale(d_width,d_height);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
871 aspect_save_screenres(vo_screenwidth,vo_screenheight);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
872
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
873 aspect(&d_width,&d_height,A_NOZOOM);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
874
12885
010a28a43c9f fix for people experimenting with GUI under windows
reimar
parents: 12842
diff changeset
875 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32)
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
876 if (use_gui) {
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
877 if (config_glx_gui(d_width, d_height) == -1)
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
878 return -1;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
879 } else
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
880 #endif
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
881 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
882 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
883 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
884 if (config_glx(width, height, d_width, d_height, flags, title, format) == -1)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
885 #endif
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
886 return -1;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
887
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
888 glVersion = glGetString(GL_VERSION);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
889
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
890 mp_msg(MSGT_VO, MSGL_V, "[gl2] OpenGL Driver Information:\n");
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
891 mp_msg(MSGT_VO, MSGL_V, "\tvendor: %s,\n\trenderer %s,\n\tversion %s\n",
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
892 glGetString(GL_VENDOR),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
893 glGetString(GL_RENDERER),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
894 glVersion);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
895
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
896 if(glVersion[0]>'1' ||
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
897 (glVersion[0]=='1' && glVersion[2]>='2') )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
898 isGL12 = GL_TRUE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
899 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
900 isGL12 = GL_FALSE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
901
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
902 if(isGL12)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
903 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
904 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL >= 1.2 capable drivers, GOOD (16bpp and BGR is ok!)\n");
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
905 } else {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
906 mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL < 1.2 drivers, BAD (16bpp and BGR may be damaged!)\n");
2276
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
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
909 rgb_sz=r_sz+g_sz+b_sz;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
910 if(rgb_sz<=0) rgb_sz=24;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
911
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
912 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
913 gl_internal_format=GL_R3_G3_B2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
914 gl_internal_format_s="GL_R3_G3_B2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
915 } 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
916 gl_internal_format=GL_RGB4;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
917 gl_internal_format_s="GL_RGB4";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
918 } 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
919 gl_internal_format=GL_RGB5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
920 gl_internal_format_s="GL_RGB5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
921 } 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
922 gl_internal_format=GL_RGB8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
923 gl_internal_format_s="GL_RGB8";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
924 } 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
925 gl_internal_format=GL_RGB10;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
926 gl_internal_format_s="GL_RGB10";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
927 } 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
928 gl_internal_format=GL_RGBA2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
929 gl_internal_format_s="GL_RGBA2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
930 } 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
931 gl_internal_format=GL_RGBA4;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
932 gl_internal_format_s="GL_RGBA4";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
933 } 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
934 gl_internal_format=GL_RGB5_A1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
935 gl_internal_format_s="GL_RGB5_A1";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
936 } 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
937 gl_internal_format=GL_RGBA8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
938 gl_internal_format_s="GL_RGBA8";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
939 } 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
940 gl_internal_format=GL_RGB10_A2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
941 gl_internal_format_s="GL_RGB10_A2";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
942 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
943 gl_internal_format=GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
944 gl_internal_format_s="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
945 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
946
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
947 #ifdef TEXTUREFORMAT_ALWAYS
12762
cf8979836dc5 100l, OSX compile fix, patch by Steven Schulz (sms (at) 2BSD (dot) com)
reimar
parents: 12750
diff changeset
948 gl_internal_format=TEXTUREFORMAT_ALWAYS;
cf8979836dc5 100l, OSX compile fix, patch by Steven Schulz (sms (at) 2BSD (dot) com)
reimar
parents: 12750
diff changeset
949 gl_internal_format_s=TEXTUREFORMAT_ALWAYS_S;
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
950 #endif
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
951
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
952 if (IMGFMT_IS_BGR(format))
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
953 {
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
954 image_mode=MODE_BGR;
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
955 image_bpp=IMGFMT_BGR_DEPTH(format);
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
956 }
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
957 else
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
958 {
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
959 image_mode=MODE_RGB;
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
960 image_bpp=IMGFMT_RGB_DEPTH(format);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
961 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
962
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
963 image_bytes=(image_bpp+7)/8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
964
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
965 draw_alpha_fnc=draw_alpha_null;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
966
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
967 switch(image_bpp)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
968 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
969 case 15:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
970 case 16:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
971 if(image_mode!=MODE_BGR)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
972 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
973 gl_bitmap_format = GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
974 gl_bitmap_format_s ="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
975 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
976 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
977 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
978 gl_bitmap_format = GL_BGR;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
979 gl_bitmap_format_s ="GL_BGR";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
980 gl_bitmap_type = GL_UNSIGNED_SHORT_5_6_5;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
981 gl_bitmap_type_s ="GL_UNSIGNED_SHORT_5_6_5";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
982 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
983
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
984 if (image_bpp==15)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
985 draw_alpha_fnc=draw_alpha_15;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
986 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
987 draw_alpha_fnc=draw_alpha_16;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
988
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
989 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
990 case 24:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
991 if(image_mode!=MODE_BGR)
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 /* RGB888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
994 gl_bitmap_format = GL_RGB;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
995 gl_bitmap_format_s ="GL_RGB";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
996 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
997 /* BGR888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
998 gl_bitmap_format = GL_BGR;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
999 gl_bitmap_format_s ="GL_BGR";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1000 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1001 gl_bitmap_type = GL_UNSIGNED_BYTE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1002 gl_bitmap_type_s ="GL_UNSIGNED_BYTE";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1003
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1004 draw_alpha_fnc=draw_alpha_24; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1005 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1006 case 32:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1007 /* RGBA8888 */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1008 gl_bitmap_format = GL_BGRA;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1009 gl_bitmap_format_s ="GL_BGRA";
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1010
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1011 if(image_mode!=MODE_BGR)
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 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
1014 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
1015 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1016 gl_bitmap_type = GL_UNSIGNED_INT_8_8_8_8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1017 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
1018 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1019
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1020 draw_alpha_fnc=draw_alpha_32; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1021 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1022 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1023
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1024 if (initGl(d_width, d_height) == -1)
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1025 return -1;
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1026 #ifndef GL_WIN32
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1027 if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1028 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1029
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1030 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1031 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1032
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1033 static int gl_handlekey(int key)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1034 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1035 if(key=='a'||key=='A')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1036 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1037 gl_set_antialias(!gl_antialias);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1038 return 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1039 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1040 else if(key=='b'||key=='B')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1041 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1042 gl_set_bilinear(-1);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1043 return 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1044 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1045 return 1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1046 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1047
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1048 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1049
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1050 static void check_events(void) {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1051 int e=vo_w32_check_events();
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
1052 if(e&VO_EVENT_RESIZE) resize(&vo_dwidth, &vo_dheight);
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1053 if(e&VO_EVENT_EXPOSE && int_pause) flip_page();
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1054 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1055
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1056 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1057
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1058 static void check_events(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1059 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1060 XEvent Event;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1061 char buf[100];
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1062 KeySym keySym;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1063 int key;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1064 static XComposeStatus stat;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1065 int e;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
1066
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1067 while ( XPending( mDisplay ) )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1068 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1069 XNextEvent( mDisplay,&Event );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1070 if( Event.type == KeyPress )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1071 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1072
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1073 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1074 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1075 : ( keySym ) ;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1076 if(gl_handlekey(key))
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1077 XPutBackEvent(mDisplay, &Event);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1078 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1079 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1080 XPutBackEvent(mDisplay, &Event);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1081 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1082 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1083 }
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
1084 e=vo_x11_check_events(mDisplay);
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
1085 if(e&VO_EVENT_RESIZE) resize(&vo_dwidth, &vo_dheight);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
1086 if(e&VO_EVENT_EXPOSE && int_pause) flip_page();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1087 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1088
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1089 #endif
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1090
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1091 static void draw_osd(void)
12446
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
1092 {
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
1093 if (ImageData)
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
1094 vo_draw_text(image_width,image_height,draw_alpha_fnc);
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
1095 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1096
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1097 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1098 flip_page(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1099 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1100
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1101 drawTextureDisplay();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1102
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1103 // glFlush();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1104 glFinish();
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1105 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1106 SwapBuffers(vo_hdc);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1107 #else
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1108 glXSwapBuffers( mDisplay,vo_window );
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1109 #endif
12394
b3ff1a576b8c clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents: 12382
diff changeset
1110
b3ff1a576b8c clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents: 12382
diff changeset
1111 if (vo_fs) // Avoid flickering borders in fullscreen mode
b3ff1a576b8c clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents: 12382
diff changeset
1112 glClear (GL_COLOR_BUFFER_BIT);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1113 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1114
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1115 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1116 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
1117 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1118 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1119 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1120
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1121 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1122 draw_frame_x11_bgr(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1123 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1124 resetTexturePointers((unsigned char *)src[0]);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1125 ImageData=(unsigned char *)src[0];
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1126
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1127 // 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
1128
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1129 setupTextureDirtyArea(0, 0, image_width, image_height);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1130 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1131 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1132
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1133 static inline uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1134 draw_frame_x11_rgb(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1135 {
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1136 resetTexturePointers((unsigned char *)src[0]);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1137 ImageData=(unsigned char *)src[0];
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1138
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1139 setupTextureDirtyArea(0, 0, image_width, image_height);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
1140 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1141 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1142
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1143
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1144 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1145 draw_frame(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1146 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1147 uint32_t res = 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1148
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1149 if (IMGFMT_IS_RGB(image_format))
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1150 res = draw_frame_x11_rgb(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1151 else
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1152 res = draw_frame_x11_bgr(src);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1153
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1154 return res;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1155 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1156
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1157 static uint32_t
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1158 query_format(uint32_t format)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1159 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1160 switch(format){
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
1161 #ifdef SYS_DARWIN
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
1162 case IMGFMT_RGB32:
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
1163 #else
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1164 case IMGFMT_RGB24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1165 case IMGFMT_BGR24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1166 // case IMGFMT_RGB32:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1167 // case IMGFMT_BGR32:
12750
38c660174053 removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).
reimar
parents: 12709
diff changeset
1168 #endif
6212
2001affedb75 query_format revised
alex
parents: 6095
diff changeset
1169 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1170 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1171 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1172 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1173
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1174
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1175 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1176 uninit(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1177 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1178 if ( !vo_config_count ) return;
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1179 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1180 vo_w32_uninit();
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1181 #else
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1182 vo_x11_uninit();
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1183 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1184 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1185
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1186 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1187 {
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
1188 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
1189 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
1190 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Unknown subdevice: %s\n",arg);
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
1191 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
1192 }
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7763
diff changeset
1193 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
1194 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1195 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1196
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
1197 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1198 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1199 switch (request) {
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
1200 case VOCTRL_PAUSE: return (int_pause=1);
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
1201 case VOCTRL_RESUME: return (int_pause=0);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1202 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1203 return query_format(*((uint32_t*)data));
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
1204 case VOCTRL_GUISUPPORT:
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
1205 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1206 case VOCTRL_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1207 #ifdef GL_WIN32
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1208 vo_w32_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1209 #else
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1210 vo_x11_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1211 #endif
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1212 return VO_TRUE;
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1213 case VOCTRL_FULLSCREEN:
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1214 #ifdef GL_WIN32
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1215 vo_w32_fullscreen();
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1216 initGl(vo_dwidth, vo_dheight);
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1217 #else
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1218 vo_x11_fullscreen();
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1219 #endif
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1220 return VO_TRUE;
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1221 #ifndef GL_WIN32
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1222 case VOCTRL_SET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1223 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1224 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1225 int value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1226
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1227 va_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1228 value = va_arg(ap, int);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1229 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1230 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
1231 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1232 case VOCTRL_GET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1233 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1234 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1235 int *value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1236
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1237 va_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1238 value = va_arg(ap, int *);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1239 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1240 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
1241 }
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1242 #endif
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1243 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1244 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1245 }