annotate libvo/vo_gl2.c @ 22705:f8fe4c872e9e

Remove conditional addition of CONFIG_DARWIN to CFLAGS, it's added unconditionally three lines above ...
author diego
date Sun, 18 Mar 2007 19:38:43 +0000
parents fb03fcc0817e
children 17bf4f4b0715
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
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
11 #include "config.h"
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
12 #include "mp_msg.h"
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
13 #include "subopt-helper.h"
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
14 #include "video_out.h"
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
15 #include "video_out_internal.h"
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7964
diff changeset
16 #include "sub.h"
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
17
18742
da5ceabe9a43 Make header include order more similar to vo_gl.c
reimar
parents: 18619
diff changeset
18 #include "gl_common.h"
da5ceabe9a43 Make header include order more similar to vo_gl.c
reimar
parents: 18619
diff changeset
19 #include "aspect.h"
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
20 #ifdef HAVE_NEW_GUI
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13653
diff changeset
21 #include "Gui/interface.h"
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
22 #endif
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
23
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
24 #define NDEBUG
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
25 //#undef NDEBUG
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
26
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
27 #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
28 #ifdef SYS_DARWIN
12842
5ab2ea430653 use RGB32 textures on OS X
reimar
parents: 12762
diff changeset
29 #define TEXTUREFORMAT_ALWAYS 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
30 #endif
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
31
16594
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
32 //! force texture height, useful for debugging
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
33 #define TEXTURE_HEIGHT 128
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
34 #undef TEXTURE_HEIGHT
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
35 //! force texture width, useful for debugging
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
36 #define TEXTURE_WIDTH 128
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
37 #undef TEXTURE_WIDTH
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
38
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
39 static vo_info_t info =
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
40 {
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
41 "X11 (OpenGL) - multiple textures version",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
42 "gl2",
2126
724af64311c8 info & author changed
arpi
parents: 2124
diff changeset
43 "Arpad Gereoffy & Sven Goethel",
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
44 ""
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
45 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
46
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
47 LIBVO_EXTERN(gl2)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
48
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
49 /* local data */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
50 static unsigned char *ImageData=NULL;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
51
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
52 #ifdef GL_WIN32
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
53 static int gl_vinfo = 0;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
54 static HGLRC gl_context = 0;
21631
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 18949
diff changeset
55 #define update_xinerama_info w32_update_xinerama_info
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 18949
diff changeset
56 #define vo_init vo_w32_init
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 18949
diff changeset
57 #define vo_window vo_w32_window
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
58 #else
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
59 static XVisualInfo *gl_vinfo = NULL;
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
60 static GLXContext gl_context = 0;
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
61 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
62
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
63 static uint32_t image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
64 static uint32_t image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
65 static uint32_t image_format;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
66 static uint32_t image_bpp;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
67 static uint32_t image_bytes;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
68
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
69 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
70
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
71 static uint32_t texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
72 static uint32_t texture_height;
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
73 static int texnumx, texnumy, raw_line_len;
13540
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
74 static struct TexSquare * texgrid = NULL;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
75 static GLuint fragprog;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
76 static GLuint lookupTex;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
77 static GLint gl_internal_format;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
78 static int rgb_sz, r_sz, g_sz, b_sz, a_sz;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16282
diff changeset
79 static GLenum gl_bitmap_format;
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16282
diff changeset
80 static GLenum gl_bitmap_type;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
81 static int isGL12 = GL_FALSE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
82
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
83 static int gl_bilinear=1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
84 static int gl_antialias=0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
85 static int use_yuv;
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
86 static int use_glFinish;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
87
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
88 static void (*draw_alpha_fnc)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
89 (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
90
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
91
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
92 /* The squares that are tiled to make up the game screen polygon */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
93
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
94 struct TexSquare
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
95 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
96 GLubyte *texture;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
97 GLuint texobj;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
98 GLuint uvtexobjs[2];
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
99 int isTexture;
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
100 GLfloat fx, fy, fw, fh;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
101 int isDirty;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
102 int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
103 };
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
104
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
105 static GLint getInternalFormat(void)
14090
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
106 {
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
107 #ifdef GL_WIN32
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
108 PIXELFORMATDESCRIPTOR pfd;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
109 int pf = GetPixelFormat(vo_hdc);
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
110 if (!DescribePixelFormat(vo_hdc, pf, sizeof pfd, &pfd)) {
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
111 r_sz = g_sz = b_sz = a_sz = 0;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
112 } else {
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
113 r_sz = pfd.cRedBits;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
114 g_sz = pfd.cGreenBits;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
115 b_sz = pfd.cBlueBits;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
116 a_sz = pfd.cAlphaBits;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
117 }
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
118 #else
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
119 if (glXGetConfig(mDisplay, gl_vinfo, GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
120 if (glXGetConfig(mDisplay, gl_vinfo, GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
121 if (glXGetConfig(mDisplay, gl_vinfo, GLX_BLUE_SIZE, &b_sz) != 0) b_sz = 0;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
122 if (glXGetConfig(mDisplay, gl_vinfo, GLX_ALPHA_SIZE, &a_sz) != 0) a_sz = 0;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
123 #endif
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
124
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
125 rgb_sz=r_sz+g_sz+b_sz;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
126 if(rgb_sz<=0) rgb_sz=24;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
127
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
128 #ifdef TEXTUREFORMAT_ALWAYS
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
129 return TEXTUREFORMAT_ALWAYS;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
130 #else
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
131 if(r_sz==3 && g_sz==3 && b_sz==2 && a_sz==0)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
132 return GL_R3_G3_B2;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
133 if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==0)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
134 return GL_RGB4;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
135 if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==0)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
136 return GL_RGB5;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
137 if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==0)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
138 return GL_RGB8;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
139 if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==0)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
140 return GL_RGB10;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
141 if(r_sz==2 && g_sz==2 && b_sz==2 && a_sz==2)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
142 return GL_RGBA2;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
143 if(r_sz==4 && g_sz==4 && b_sz==4 && a_sz==4)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
144 return GL_RGBA4;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
145 if(r_sz==5 && g_sz==5 && b_sz==5 && a_sz==1)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
146 return GL_RGB5_A1;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
147 if(r_sz==8 && g_sz==8 && b_sz==8 && a_sz==8)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
148 return GL_RGBA8;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
149 if(r_sz==10 && g_sz==10 && b_sz==10 && a_sz==2)
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
150 return GL_RGB10_A2;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
151 #endif
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
152 return GL_RGB;
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
153 }
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
154
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
155 static int initTextures(void)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
156 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
157 struct TexSquare *tsq=0;
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
158 GLfloat texpercx, texpercy;
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16220
diff changeset
159 int s;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
160 int x=0, y=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
161 GLint format=0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
162 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
163
16222
8683e4609f3f textures smaller 64x64 might not be supported
reimar
parents: 16221
diff changeset
164 // textures smaller than 64x64 might not be supported
8683e4609f3f textures smaller 64x64 might not be supported
reimar
parents: 16221
diff changeset
165 s=64;
16220
1effc23b2cb8 10l, texture_width/height initialization was removed, so use
reimar
parents: 16214
diff changeset
166 while (s<image_width)
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
167 s*=2;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
168 texture_width=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
169
16222
8683e4609f3f textures smaller 64x64 might not be supported
reimar
parents: 16221
diff changeset
170 s=64;
16220
1effc23b2cb8 10l, texture_width/height initialization was removed, so use
reimar
parents: 16214
diff changeset
171 while (s<image_height)
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
172 s*=2;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
173 texture_height=s;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
174
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
175 if (image_format != IMGFMT_YV12)
14090
e84643be7bd0 Move selection of internal texture format to appropriate place, should
reimar
parents: 14078
diff changeset
176 gl_internal_format = getInternalFormat();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
177
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
178 /* Test the max texture size */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
179 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
180 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
181 glTexImage2D (GL_PROXY_TEXTURE_2D, 0,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
182 gl_internal_format,
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
183 texture_width, texture_height,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
184 0, gl_bitmap_format, gl_bitmap_type, NULL);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
185
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
186 glGetTexLevelParameteriv
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
187 (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
188
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
189 if (format != gl_internal_format)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
190 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
191 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
192 texture_height, texture_width);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
193
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
194 if (texture_width > texture_height)
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
195 texture_width /= 2;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
196 else
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
197 texture_height /= 2;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
198
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
199 mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_height, texture_width);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
200
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
201 if(texture_width < 64 || texture_height < 64)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
202 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
203 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
204 return -1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
205 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
206 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
207 }
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
208 while (format != gl_internal_format && texture_width > 1 && texture_height > 1);
16594
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
209 #ifdef TEXTURE_WIDTH
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
210 texture_width = TEXTURE_WIDTH;
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
211 #endif
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
212 #ifdef TEXTURE_HEIGHT
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
213 texture_height = TEXTURE_HEIGHT;
7b30ec73e83e debugging/testing helpers: allow forcing a certain width/height for textures
reimar
parents: 16590
diff changeset
214 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
215
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
216 texnumx = image_width / texture_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
217 if ((image_width % texture_width) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
218 texnumx++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
219
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
220 texnumy = image_height / texture_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
221 if ((image_height % texture_height) > 0)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
222 texnumy++;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
223
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
224 mp_msg(MSGT_VO, MSGL_V, "[gl2] Creating %dx%d textures of size %dx%d ...\n",
3564
alex
parents: 2732
diff changeset
225 texnumx, texnumy, texture_width,texture_height);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
226
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
227 /* Allocate the texture memory */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
228
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
229 texpercx = (GLfloat) texture_width / (GLfloat) image_width;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
230 texpercy = (GLfloat) texture_height / (GLfloat) image_height;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
231
13540
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
232 if (texgrid)
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
233 free(texgrid);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
234 texgrid = (struct TexSquare *)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
235 calloc (texnumx * texnumy, sizeof (struct TexSquare));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
236
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
237 raw_line_len = image_width * image_bytes;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
238
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
239 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
240 (int) texnumx, (int) texture_width, (int) texnumy,
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
241 (int) texture_height);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
242
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
243 tsq = texgrid;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
244 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
245 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
246 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
247 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
248
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
249 tsq->fx = x * texpercx;
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
250 tsq->fy = y * texpercy;
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
251 tsq->fw = texpercx;
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
252 tsq->fh = texpercy;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
253
16224
f18e92e72216 use glUploadTex helper function
reimar
parents: 16222
diff changeset
254 tsq->isDirty=GL_FALSE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
255 tsq->isTexture=GL_FALSE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
256 tsq->texobj=0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
257 tsq->uvtexobjs[0] = tsq->uvtexobjs[1] = 0;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
258 tsq->dirtyXoff=0; tsq->dirtyYoff=0; tsq->dirtyWidth=-1; tsq->dirtyHeight=-1;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
259
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
260 glGenTextures (1, &(tsq->texobj));
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
261
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
262 glBindTexture (GL_TEXTURE_2D, tsq->texobj);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
263 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
264 glGenTextures(2, tsq->uvtexobjs);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
265 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
266 glBindTexture (GL_TEXTURE_2D, tsq->uvtexobjs[0]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
267 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
268 glBindTexture (GL_TEXTURE_2D, tsq->uvtexobjs[1]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
269 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
270 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
271 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
272 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
273 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
274 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
275 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
276
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
277 if(glIsTexture(tsq->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
278 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
279 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
280 x, y, tsq->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
281 } else {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
282 tsq->isTexture=GL_TRUE;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
283 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
284
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
285 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR,
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
286 texture_width, texture_height, 0);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
287
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
288 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
289 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
290 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
291 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR,
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
292 texture_width / 2, texture_height / 2, 128);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
293 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
294 glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR,
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
295 texture_width / 2, texture_height / 2, 128);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
296 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
297 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
298
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
299 tsq++;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
300 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
301 } /* for all texnumy */
10604
alex
parents: 10143
diff changeset
302
alex
parents: 10143
diff changeset
303 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
304 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
305
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
306 static void resetTexturePointers(unsigned char *imageSource)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
307 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
308 unsigned char *texdata_start, *line_start;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
309 struct TexSquare *tsq = texgrid;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
310 int x=0, y=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
311
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
312 line_start = (unsigned char *) imageSource;
2276
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 for (y = 0; y < texnumy; y++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
315 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
316 texdata_start = line_start;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
317 for (x = 0; x < texnumx; x++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
318 {
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
319 tsq->texture = texdata_start;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
320 texdata_start += texture_width * image_bytes;
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
321 tsq++;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
322 } /* for all texnumx */
12448
180c2fb327d3 removing useless code, improving readability
reimar
parents: 12446
diff changeset
323 line_start += texture_height * raw_line_len;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
324 } /* for all texnumy */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
325 }
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 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
328 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
329 struct TexSquare *square;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
330 int xi, yi, wd, ht, wh, hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
331 int wdecr, hdecr, xh, yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
332
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
333 wdecr=w; hdecr=h; xh=x; yh=y;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
334
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
335 for (yi = 0; hdecr>0 && yi < texnumy; yi++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
336 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
337 if (yi < texnumy - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
338 ht = texture_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
339 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
340 ht = image_height - texture_height * yi;
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 xh =x;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
343 wdecr =w;
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 for (xi = 0; wdecr>0 && xi < texnumx; xi++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
346 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
347 square = texgrid + yi * texnumx + xi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
348
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
349 if (xi < texnumx - 1)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
350 wd = texture_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
351 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
352 wd = image_width - texture_width * xi;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
353
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
354 if( 0 <= xh && xh < wd &&
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
355 0 <= yh && yh < ht
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 square->isDirty=GL_TRUE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
359
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
360 wh=(wdecr<wd)?wdecr:wd-xh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
361 if(wh<0) wh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
362
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
363 hh=(hdecr<ht)?hdecr:ht-yh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
364 if(hh<0) hh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
365
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
366 /*
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
367 #ifndef NDEBUG
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
368 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
369 xi, yi, xh, yh, wdecr, hdecr, xh, yh, wh, hh);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
370 #endif
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 if(xh<square->dirtyXoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
374 square->dirtyXoff=xh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
375
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
376 if(yh<square->dirtyYoff)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
377 square->dirtyYoff=yh;
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 square->dirtyWidth = wd-square->dirtyXoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
380 square->dirtyHeight = ht-square->dirtyYoff;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
381
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
382 wdecr-=wh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
383
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
384 if ( xi == texnumx - 1 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
385 hdecr-=hh;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
386 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
387
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
388 xh-=wd;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
389 if(xh<0) xh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
390 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
391 yh-=ht;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
392 if(yh<0) yh=0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
393 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
394 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
395
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
396 static void gl_set_bilinear (int val)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
397 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
398 int x, y;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
399
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
400 if(val>=0)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
401 gl_bilinear = val;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
402 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
403 gl_bilinear++;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
404
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
405 gl_bilinear=gl_bilinear%2;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
406 /* no mipmap yet .. */
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
407
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
408 for (y = 0; y < texnumy; y++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
409 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
410 for (x = 0; x < texnumx; x++)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
411 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
412 glBindTexture (GL_TEXTURE_2D, texgrid[y * texnumx + x].texobj);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
413
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
414 switch (gl_bilinear)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
415 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
416 case 0:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
417 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
418 GL_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
419 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
420 GL_NEAREST);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
421 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
422 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
423 case 1:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
424 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
425 GL_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
426 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
427 GL_LINEAR);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
428 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
429 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
430 case 2:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
431 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
432 GL_LINEAR_MIPMAP_NEAREST);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
433 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
434 GL_LINEAR_MIPMAP_NEAREST);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
435 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
436 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
437 case 3:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
438 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
439 GL_LINEAR_MIPMAP_LINEAR);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
440 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
441 GL_LINEAR_MIPMAP_LINEAR);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
442 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
443 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
444 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
445 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
446 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
447 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
448
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
449 static void gl_set_antialias (int val)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
450 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
451 gl_antialias=val;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
452
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
453 if (gl_antialias)
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 glShadeModel (GL_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
456 glEnable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
457 glEnable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
458 glEnable (GL_POINT_SMOOTH);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
459 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
460 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
461 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
462 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
463 glShadeModel (GL_FLAT);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
464 glDisable (GL_POLYGON_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
465 glDisable (GL_LINE_SMOOTH);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
466 glDisable (GL_POINT_SMOOTH);
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
467 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
468 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
469 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
470
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
471
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
472 static void drawTextureDisplay (void)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
473 {
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
474 struct TexSquare *square = texgrid;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8148
diff changeset
475 int x, y/*, xoff=0, yoff=0, wd, ht*/;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
476 GLenum err;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
477
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
478 glColor3f(1.0,1.0,1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
479
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
480 if (image_format == IMGFMT_YV12)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
481 glEnableYUVConversion(GL_TEXTURE_2D, use_yuv);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
482 for (y = 0; y < texnumy; y++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
483 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
484 for (x = 0; x < texnumx; x++)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
485 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
486 if(square->isTexture==GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
487 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
488 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
489 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
490 continue;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
491 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
492
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
493 glBindTexture (GL_TEXTURE_2D, square->texobj);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
494 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
495 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
496 glBindTexture (GL_TEXTURE_2D, square->uvtexobjs[0]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
497 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
498 glBindTexture (GL_TEXTURE_2D, square->uvtexobjs[1]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
499 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
500 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
501 err = glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
502 if(err==GL_INVALID_ENUM)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
503 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
504 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
505 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
506 else if(err==GL_INVALID_OPERATION) {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
507 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
508 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
509
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16220
diff changeset
510 #ifndef NDEBUG
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
511 if(glIsTexture(square->texobj) == GL_FALSE)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
512 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
513 square->isTexture=GL_FALSE;
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
514 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
515 x, y, square->texobj);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
516 }
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16220
diff changeset
517 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
518
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
519 if(square->isDirty)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
520 {
16224
f18e92e72216 use glUploadTex helper function
reimar
parents: 16222
diff changeset
521 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type,
f18e92e72216 use glUploadTex helper function
reimar
parents: 16222
diff changeset
522 square->texture, image_width * image_bytes,
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
523 square->dirtyXoff, square->dirtyYoff,
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
524 square->dirtyWidth, square->dirtyHeight,
16224
f18e92e72216 use glUploadTex helper function
reimar
parents: 16222
diff changeset
525 0);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
526
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
527 square->isDirty=GL_FALSE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
528 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
529 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
530
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
531 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
532 x, y, square->dirtyXoff, square->dirtyYoff, square->dirtyWidth, square->dirtyHeight);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
533
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
534 glDrawTex(square->fx, square->fy, square->fw, square->fh,
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
535 0, 0, texture_width, texture_height,
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
536 texture_width, texture_height,
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
537 0, image_format == IMGFMT_YV12, 0);
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
538 square++;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
539 } /* for all texnumx */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
540 } /* for all texnumy */
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
541 if (image_format == IMGFMT_YV12)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
542 glDisableYUVConversion(GL_TEXTURE_2D, use_yuv);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
543
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10919
diff changeset
544 /* YES - let's catch this error ...
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
545 */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
546 (void) glGetError ();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
547 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
548
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
549
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
550 static void resize(int *x,int *y){
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
551 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
552 if( vo_fs )
10905
f448dcd93e6d dont fix things at the wrong place
attila
parents: 10902
diff changeset
553 {
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
554 glClear(GL_COLOR_BUFFER_BIT);
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
555 aspect(x, y, A_ZOOM);
16590
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
556 panscan_calc();
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
557 *x += vo_panscan_x;
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
558 *y += vo_panscan_y;
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
559 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
560 } else {
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
561 //aspect(x, y, A_NOZOOM);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
562 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
563 int top = 0, left = 0, w = *x, h = *y;
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
564 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight);
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
565 glViewport(top, left, w, h);
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
566 } else
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
567 glViewport( 0, 0, *x, *y );
10905
f448dcd93e6d dont fix things at the wrong place
attila
parents: 10902
diff changeset
568 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
569
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
570 glMatrixMode(GL_PROJECTION);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
571 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
572 glOrtho (0, 1, 1, 0, -1.0, 1.0);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
573
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
574 glMatrixMode(GL_MODELVIEW);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
575 glLoadIdentity();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
576 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
577
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
578 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
579 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
580 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
581
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
582 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
583 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
584 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
585
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
586 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
587 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
588 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
589
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
590 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
591 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
592 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
593
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
594 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
595 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
596
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
597 #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
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 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) {
18079
f57317460375 fixes and cleanup for windows fullscreen switching (restore old position,
reimar
parents: 17566
diff changeset
600 if (!vo_w32_config(d_width, d_height, flags))
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
601 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
602
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
603 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
604 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
605
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
606 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
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 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
610
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
611 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
612 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
613 XVisualInfo template, *vi_list;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
614 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
615
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
616 template.screen = scr;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
617 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
618 if (!vi_list) return -1;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7964
diff changeset
619 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
620 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
621 int val, res, w = 0;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
622 /* 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
623 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
624 if (res || val == False) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
625 /* also it must be doublebuffered ... */
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_DOUBLEBUFFER, &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 /* 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
629 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
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 /* prefer less depth buffer size, */
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_DEPTH_SIZE, &val);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
633 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
634 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
635 /* stencil buffer size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
636 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
637 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
638 w += val*2;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
639 /* and colorbuffer alpha size */
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
640 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
641 if (res) continue;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
642 w += val;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
643 /* 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
644 if (vi_list[i].class != DirectColor) w += 100;
12709
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
645
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
646 // avoid bad-looking visual with less that 8bit per color
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
647 res = glXGetConfig(dpy, vi_list + i, GLX_RED_SIZE, &val);
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
648 if (res) continue;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
649 if (val < 8) w += 50;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
650 res = glXGetConfig(dpy, vi_list + i, GLX_GREEN_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 += 70;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
653 res = glXGetConfig(dpy, vi_list + i, GLX_BLUE_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 += 50;
bd90b887fb13 avoid visuals with low color-depth.
reimar
parents: 12448
diff changeset
656
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
657 if (w < best_weight) {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
658 best_weight = w;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
659 best_i = i;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
660 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
661 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
662 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
663 XFree(vi_list);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
664 return (best_weight < 1000000) ? 0 : -1;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
665 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
666
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
667 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) {
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
668 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
669 vo_window = WinID ? (Window)WinID : mRootWin;
16239
87da68468e6d Get events from -wid window.
reimar
parents: 16224
diff changeset
670 vo_x11_selectinput_witherr(mDisplay, vo_window,
87da68468e6d Get events from -wid window.
reimar
parents: 16224
diff changeset
671 StructureNotifyMask | KeyPressMask | PointerMotionMask |
87da68468e6d Get events from -wid window.
reimar
parents: 16224
diff changeset
672 ButtonPressMask | ButtonReleaseMask | ExposureMask);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
673 return 0;
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
674 }
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
675 if ( vo_window == None )
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
676 {
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
677 XSizeHints hint;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
678 XVisualInfo *vinfo, vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
679 XEvent xev;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
680
15589
c3108031b78a Implement -geometry for vo gl and gl2.
reimar
parents: 14747
diff changeset
681 hint.x = vo_dx;
c3108031b78a Implement -geometry for vo gl and gl2.
reimar
parents: 14747
diff changeset
682 hint.y = vo_dy;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
683 hint.width = d_width;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
684 hint.height = d_height;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
685 hint.flags = PPosition | PSize;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
686
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
687 /* Make the window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
688
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
689 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
690
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
691 // 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
692 vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
693 if (vinfo == NULL)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
694 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
695 mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] no GLX support present\n");
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
696 return -1;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
697 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
698
12035
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
699 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
700 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
701 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
702
22248
fb03fcc0817e Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents: 22232
diff changeset
703 vo_x11_classhint( mDisplay,vo_window,"gl2" );
fb03fcc0817e Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents: 22232
diff changeset
704 vo_hidecursor(mDisplay,vo_window);
fb03fcc0817e Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
reimar
parents: 22232
diff changeset
705
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
706 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
707
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
708 /* Tell other applications about this window */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
709
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
710 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
711
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
712 /* Map window. */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
713 XMapWindow(mDisplay, vo_window);
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
714 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
715 XClearWindow(mDisplay,vo_window);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
716
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
717 /* Wait for map. */
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
718 do
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
719 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
720 XNextEvent(mDisplay, &xev);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
721 }
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
722 while (xev.type != MapNotify || xev.xmap.event != vo_window);
12035
b3512c7b26ce corrected problems with switching to and from fullscreen mode esp. with fixed-vo
reimar
parents: 11988
diff changeset
723
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
724 XSync(mDisplay, False);
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
725
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
726 //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!!
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6212
diff changeset
727 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
728 | ButtonPressMask | ButtonReleaseMask | ExposureMask
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4596
diff changeset
729 );
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
730 }
15589
c3108031b78a Implement -geometry for vo gl and gl2.
reimar
parents: 14747
diff changeset
731 vo_x11_nofs_sizepos(vo_dx, vo_dy, d_width, d_height);
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
732 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
733 vo_x11_fullscreen();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
734
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
735 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
736 }
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
737 #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
738
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
739 #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
740 static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
741 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
742 return 0;
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
743 }
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
744 #endif
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
745
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
746 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
747 {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
748 fragprog = lookupTex = 0;
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
749 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
750 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
751
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
752 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
753 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
754 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
755 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
756 glEnable (GL_TEXTURE_2D);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
757 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
758 switch (use_yuv) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
759 case YUV_CONVERSION_FRAGMENT_LOOKUP:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
760 glGenTextures(1, &lookupTex);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
761 ActiveTexture(GL_TEXTURE3);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
762 glBindTexture(GL_TEXTURE_2D, lookupTex);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
763 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
764 glBindTexture(GL_TEXTURE_2D, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
765 case YUV_CONVERSION_FRAGMENT_POW:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
766 case YUV_CONVERSION_FRAGMENT:
18584
212999db0203 Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents: 18116
diff changeset
767 if (!GenPrograms || !BindProgram) {
212999db0203 Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents: 18116
diff changeset
768 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n");
212999db0203 Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents: 18116
diff changeset
769 break;
212999db0203 Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
reimar
parents: 18116
diff changeset
770 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
771 GenPrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
772 BindProgram(GL_FRAGMENT_PROGRAM, fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
773 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
774 }
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18584
diff changeset
775 glSetupYUVConversion(GL_TEXTURE_2D, use_yuv, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0,
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18584
diff changeset
776 texture_width, texture_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
777 }
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
778
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
779 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
780 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
781
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
782 mp_msg(MSGT_VO, MSGL_V, "[gl2] Using image_bpp=%d, image_bytes=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\trgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n",
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
783 image_bpp, image_bytes,
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
784 glValName(gl_bitmap_format), glValName(gl_bitmap_type),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
785 rgb_sz, r_sz, g_sz, b_sz, a_sz, glValName(gl_internal_format));
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
786
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
787 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
788
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
789 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
790 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
791
13926
b7ba9bcd1916 Avoid drawing before transformation matrices are set up.
reimar
parents: 13877
diff changeset
792 drawTextureDisplay ();
b7ba9bcd1916 Avoid drawing before transformation matrices are set up.
reimar
parents: 13877
diff changeset
793
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
794 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
795 }
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
796
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
797 /* 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
798 * 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
799 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
800 static int
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
801 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
802 {
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
803 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
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 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
806 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
807 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
808
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
809 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
810
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
811 #ifdef HAVE_NEW_GUI
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
812 if (use_gui) {
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
813 if (config_glx_gui(d_width, d_height) == -1)
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
814 return -1;
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
815 }
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
816 #ifndef GL_WIN32
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
817 else
51aeef9ada52 Improve windows gui support
reimar
parents: 18742
diff changeset
818 #endif
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
819 #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
820 #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
821 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
822 #else
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
823 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
824 #endif
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
825 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
826
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
827 setGlWindow(&gl_vinfo, &gl_context, vo_window);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
828
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
829 glVersion = glGetString(GL_VERSION);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
830
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
831 mp_msg(MSGT_VO, MSGL_V, "[gl2] OpenGL Driver Information:\n");
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
832 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
833 glGetString(GL_VENDOR),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
834 glGetString(GL_RENDERER),
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
835 glVersion);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
836
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
837 if(glVersion[0]>'1' ||
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
838 (glVersion[0]=='1' && glVersion[2]>='2') )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
839 isGL12 = GL_TRUE;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
840 else
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
841 isGL12 = GL_FALSE;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
842
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
843 if(isGL12)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
844 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
845 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
846 } else {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
847 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
848 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
849
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
850 glFindFormat(format, &image_bpp, &gl_internal_format, &gl_bitmap_format, &gl_bitmap_type);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
851
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
852 image_bytes=(image_bpp+7)/8;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
853
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
854 draw_alpha_fnc=draw_alpha_null;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
855
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
856 switch(image_bpp)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
857 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
858 case 15:
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
859 draw_alpha_fnc=draw_alpha_15;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13926
diff changeset
860 break;
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
861 case 16:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
862 draw_alpha_fnc=draw_alpha_16;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
863 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
864 case 24:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
865 draw_alpha_fnc=draw_alpha_24; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
866 case 32:
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
867 draw_alpha_fnc=draw_alpha_32; break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
868 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
869
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15595
diff changeset
870 if (initGl(vo_dwidth, vo_dheight) == -1)
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
871 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
872 #ifndef GL_WIN32
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
873 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
874 #endif
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
875
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
876 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
877 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
878
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
879 static int gl_handlekey(int key)
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
880 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
881 if(key=='a'||key=='A')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
882 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
883 gl_set_antialias(!gl_antialias);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
884 return 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
885 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
886 else if(key=='b'||key=='B')
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
887 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
888 gl_set_bilinear(-1);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
889 return 0;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
890 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
891 return 1;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
892 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
893
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
894 static void check_events(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
895 {
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
896 int e;
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
897 #ifndef GL_WIN32
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
898 XEvent Event;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
899 char buf[100];
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
900 KeySym keySym;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
901 int key;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
902 static XComposeStatus stat;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10604
diff changeset
903
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
904 while ( XPending( mDisplay ) )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
905 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
906 XNextEvent( mDisplay,&Event );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
907 if( Event.type == KeyPress )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
908 {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
909
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
910 XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
911 key = (keySym&0xff00) != 0? ( (keySym&0x00ff) + 256 )
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
912 : ( keySym ) ;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
913 if(gl_handlekey(key))
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
914 XPutBackEvent(mDisplay, &Event);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
915 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
916 } else {
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
917 XPutBackEvent(mDisplay, &Event);
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
918 break;
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
919 }
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
920 }
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
921 #endif
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
922 e=vo_check_events();
11087
b427c796638b * clear window on fullscreen switch
attila
parents: 11000
diff changeset
923 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
924 if(e&VO_EVENT_EXPOSE && int_pause) flip_page();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
925 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
926
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
927 static void draw_osd(void)
12446
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
928 {
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
929 if (ImageData)
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
930 vo_draw_text(image_width,image_height,draw_alpha_fnc);
59cd81e2e1ef fixed memory leak and removed unnecessary static variable
reimar
parents: 12394
diff changeset
931 }
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
932
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
933 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
934 flip_page(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
935 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
936
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
937 drawTextureDisplay();
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
938
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
939 // glFlush();
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
940 if (use_glFinish)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
941 glFinish();
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
942 swapGlBuffers();
12394
b3ff1a576b8c clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents: 12382
diff changeset
943
b3ff1a576b8c clear buffer after (glX)SwapBuffers in fullscreen to avoid flickering borders
reimar
parents: 12382
diff changeset
944 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
945 glClear (GL_COLOR_BUFFER_BIT);
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
946 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
947
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
948 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
949 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
950 {
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
951 uint8_t *yptr = src[0], *uptr = src[1], *vptr = src[2];
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
952 int ystride = stride[0], ustride = stride[1], vstride = stride[2];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
953 int rem_h = h;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
954 struct TexSquare *texline = &texgrid[y / texture_height * texnumx];
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
955 int subtex_y = y % texture_width;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
956 while (rem_h > 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
957 int rem_w = w;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
958 struct TexSquare *tsq = &texline[x / texture_width];
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
959 int subtex_x = x % texture_height;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
960 int subtex_h = rem_h;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
961 if (subtex_y + subtex_h > texture_height)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
962 subtex_h = texture_height - subtex_y;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
963 while (rem_w > 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
964 int subtex_w = rem_w;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
965 if (subtex_x + subtex_w > texture_width)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
966 subtex_w = texture_width - subtex_x;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
967 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
968 glBindTexture(GL_TEXTURE_2D, tsq->texobj);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
969 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type,
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
970 yptr, ystride, subtex_x, subtex_y,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
971 subtex_w, subtex_h, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
972 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
973 glBindTexture(GL_TEXTURE_2D, tsq->uvtexobjs[0]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
974 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type,
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
975 uptr, ustride, subtex_x / 2, subtex_y / 2,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
976 subtex_w / 2, subtex_h / 2, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
977 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
978 glBindTexture(GL_TEXTURE_2D, tsq->uvtexobjs[1]);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
979 glUploadTex(GL_TEXTURE_2D, gl_bitmap_format, gl_bitmap_type,
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
980 vptr, vstride, subtex_x / 2, subtex_y / 2,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
981 subtex_w / 2, subtex_h / 2, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
982 subtex_x = 0;
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
983 yptr += subtex_w;
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
984 uptr += subtex_w / 2;
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
985 vptr += subtex_w / 2;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
986 tsq++;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
987 rem_w -= subtex_w;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
988 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
989 subtex_y = 0;
16583
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
990 yptr += subtex_h * ystride - w;
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
991 uptr += subtex_h / 2 * ustride - w / 2;
84356c6d997b Fix crashes and green border when using YV12 input format
reimar
parents: 16488
diff changeset
992 vptr += subtex_h / 2 * vstride - w / 2;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
993 texline += texnumx;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
994 rem_h -= subtex_h;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
995 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
996 ActiveTexture(GL_TEXTURE0);
2276
558a9397c250 improved gl, please check performance and correct display
sven
parents: 2249
diff changeset
997 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
998 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
999
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
1000 static int
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1001 draw_frame(uint8_t *src[])
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1002 {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1003 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1004 mp_msg(MSGT_VO, MSGL_ERR, "[gl2] error: draw_frame called for YV12!\n");
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1005 return 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1006 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
1007 ImageData=(unsigned char *)src[0];
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
1008 resetTexturePointers(ImageData);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
1009 setupTextureDirtyArea(0, 0, image_width, image_height);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16171
diff changeset
1010 return 0;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1011 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1012
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
1013 static int
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1014 query_format(uint32_t format)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1015 {
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1016 switch(format){
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1017 case IMGFMT_YV12:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1018 if (use_yuv)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1019 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD |
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1020 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1021 break;
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
1022 #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
1023 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
1024 #else
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1025 case IMGFMT_RGB24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1026 case IMGFMT_BGR24:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1027 // case IMGFMT_RGB32:
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1028 // 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
1029 #endif
6212
2001affedb75 query_format revised
alex
parents: 6095
diff changeset
1030 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1031 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1032 return 0;
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1033 }
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1034
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1035
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1036 static void
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1037 uninit(void)
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1038 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
1039 if ( !vo_config_count ) return;
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13787
diff changeset
1040 releaseGlContext(&gl_vinfo, &gl_context);
13540
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
1041 if (texgrid) {
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
1042 free(texgrid);
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
1043 texgrid = NULL;
02c0d4371573 fixed memleak, especially for fixed-vo.
reimar
parents: 12895
diff changeset
1044 }
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
1045 vo_uninit();
2124
0bb00e528669 new version by Sven Goethel
arpi
parents:
diff changeset
1046 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1047
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1048 static opt_t subopts[] = {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1049 {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg},
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1050 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL},
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1051 {NULL}
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1052 };
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1053
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
1054 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1055 {
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1056 // set defaults
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1057 use_yuv = 0;
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1058 use_glFinish = 1;
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1059 if (subopt_parse(arg, subopts) != 0) {
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1060 mp_msg(MSGT_VO, MSGL_FATAL,
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1061 "\n-vo gl2 command line help:\n"
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1062 "Example: mplayer -vo gl2:noglfinish\n"
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1063 "\nOptions:\n"
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1064 " noglfinish\n"
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1065 " Do not call glFinish() before swapping buffers\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1066 " yuv=<n>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1067 " 0: use software YUV to RGB conversion.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16594
diff changeset
1068 " 1: use register combiners (nVidia only, for older cards).\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1069 " 2: use fragment program.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1070 " 3: use fragment program with gamma correction.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16475
diff changeset
1071 " 4: use fragment program with gamma correction via lookup.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16594
diff changeset
1072 " 5: use ATI-specific method (for older cards).\n"
16475
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1073 "\n" );
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1074 return -1;
55b04cfc255c Allow disabling the glFinish call
reimar
parents: 16303
diff changeset
1075 }
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7763
diff changeset
1076 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
1077 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1078 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1079
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15748
diff changeset
1080 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1081 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1082 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
1083 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
1084 case VOCTRL_RESUME: return (int_pause=0);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1085 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1086 return query_format(*((uint32_t*)data));
12382
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
1087 case VOCTRL_GUISUPPORT:
a830eebf6693 GUI support
reimar
parents: 12035
diff changeset
1088 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1089 case VOCTRL_ONTOP:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
1090 vo_ontop();
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11087
diff changeset
1091 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
1092 case VOCTRL_FULLSCREEN:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17006
diff changeset
1093 vo_fullscreen();
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
1094 if (setGlWindow(&gl_vinfo, &gl_context, vo_window) == SET_WINDOW_REINIT)
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
1095 initGl(vo_dwidth, vo_dheight);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14090
diff changeset
1096 resize(&vo_dwidth, &vo_dheight);
10143
fd3cbeb388f0 removed broken swscaler support, added runtime fullscreens switching ability, and some other general cleanup thingies
alex
parents: 8254
diff changeset
1097 return VO_TRUE;
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16626
diff changeset
1098 #ifdef GL_WIN32
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16626
diff changeset
1099 case VOCTRL_BORDER:
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16626
diff changeset
1100 vo_w32_border();
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16626
diff changeset
1101 return VO_TRUE;
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16626
diff changeset
1102 #endif
16590
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
1103 case VOCTRL_GET_PANSCAN:
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
1104 return VO_TRUE;
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
1105 case VOCTRL_SET_PANSCAN:
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
1106 resize (&vo_dwidth, &vo_dheight);
3ffa9bee23d4 panscan support
reimar
parents: 16586
diff changeset
1107 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
1108 #ifndef GL_WIN32
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1109 case VOCTRL_SET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1110 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1111 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1112 int value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1113
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1114 va_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1115 value = va_arg(ap, int);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1116 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1117 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
1118 }
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1119 case VOCTRL_GET_EQUALIZER:
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1120 {
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1121 va_list ap;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1122 int *value;
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1123
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1124 va_start(ap, data);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1125 value = va_arg(ap, int *);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1126 va_end(ap);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7931
diff changeset
1127 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
1128 }
10880
ba9557e864c0 vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net>
faust3
parents: 10757
diff changeset
1129 #endif
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21631
diff changeset
1130 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21631
diff changeset
1131 update_xinerama_info();
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21631
diff changeset
1132 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1133 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4440
diff changeset
1134 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1135 }