annotate libvo/vo_gl2.c @ 16488:3191dcb27a12

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