1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Commit Graph

91 Commits

Author SHA1 Message Date
reimar
f68be97419 Fix texture format variable types. Internal format is GLint, others are GLenum
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 12:45:57 +00:00
reimar
6f4bba6b61 -wid support for windows. Not well tested, might still behave a bit weird.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16283 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-21 09:59:45 +00:00
reimar
77ec0f850d less weird OSD alpha transformation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16273 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 12:23:34 +00:00
reimar
f37f504f2a Do not set SwapInterval for values < 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16272 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 12:16:52 +00:00
reimar
0a19444796 automatic vsync enabling for vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16269 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 09:31:02 +00:00
reimar
cbd8483a32 Get events from -wid window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16240 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 23:24:52 +00:00
reimar
c157ebb6c9 Our buffer usage actually fits better to GL_DYNAMIC_DRAW than GL_STREAM_DRAW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16238 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 19:07:07 +00:00
reimar
dfa61db50a OSD textures can be deleted with one function call...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16237 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 18:52:38 +00:00
reimar
7e6c29c530 Make glFinish optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16236 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 18:27:12 +00:00
reimar
44ec3f7566 use GenBuffers to get a buffer number instead of hardcoding 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16234 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 17:57:53 +00:00
reimar
c7888c0a7f remove/move some unused headers/variables/code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16222 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:24:49 +00:00
reimar
698494f779 Helper function for drawing texture and general cleanup of vo_gl2.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16215 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 13:44:14 +00:00
ivo
cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 01:24:37 +00:00
reimar
f467c97576 More helper functions/defines and bugfixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16118 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-27 17:22:24 +00:00
reimar
775c4db7f4 catch failed buffer allocation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16114 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 20:36:34 +00:00
reimar
1feebc74c7 OpenGL fixes for windows and vo_gl.c ported to windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16110 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 13:47:18 +00:00
reimar
c30b5e70b7 support for rectangular and streaming textures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16100 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 10:16:18 +00:00
reimar
6acf6c886e Use DRAW_IMAGE instead of draw_frame
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16093 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-25 19:11:14 +00:00
reimar
de6925b979 Enable manyfmts by default for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-19 08:42:55 +00:00
reimar
fd0aa2708e support -wid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15749 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-18 18:32:29 +00:00
reimar
1c0928d65e Fix OSD handling, DVD subtitles work now. Will be a bit slower though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15720 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-13 20:09:05 +00:00
reimar
881f0f083f -geometry support for gl2 under win, default window pos centered for gl, gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15596 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-30 08:45:21 +00:00
reimar
7322c396a9 Implement -geometry for vo gl and gl2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15590 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 17:04:51 +00:00
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-18 15:52:38 +00:00
henry
e68fc0c46a revert the previous commit, gl needs to reload the font immediately
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15087 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-10 13:12:55 +00:00
henry
d84d885309 remove force_load_font stuff moved to sub.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15081 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-09 22:45:47 +00:00
reimar
cdfb0214ba Remove a lot of duplicate code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14748 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 14:44:39 +00:00
al
546e6316ac Move generic tests to a common place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14737 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-19 20:14:00 +00:00
reimar
2ac89bd388 set sub_bg_alpha only to 255 when using hardware OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14431 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-08 17:58:56 +00:00
reimar
efa1ae2274 Use subopt helper to parse arguments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14287 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-31 14:58:49 +00:00
reimar
f9258247dd Doxygen comments improved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14270 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 14:33:40 +00:00
reimar
c977dab456 More similar code from gl and gl2 moved to gl_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14079 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-01 17:05:58 +00:00
reimar
6a197759bd 4 and 8 bit formats use a palette, so we cannot really support them (atm).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13994 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-20 10:57:39 +00:00
reimar
60fae69741 missing return for InitGl function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13921 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-11 19:39:23 +00:00
reimar
a594c4f593 more fullscreen fixes and gl2 uses setGlWindow.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13872 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-04 18:31:55 +00:00
reimar
1a7a3f8b38 fullscreen fixes and GUI support for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13844 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-01 20:24:37 +00:00
reimar
69a5c44698 OSD variant for vo_gl.c that behaves more like the one of other vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13661 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-17 19:32:47 +00:00
reimar
0164758aa8 added gl_common for code used by both vo_gl.c and vo_gl2.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13654 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-17 13:28:22 +00:00
reimar
a89dbc8ecd aspect scaling and panscan support for vo_gl.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13602 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 14:05:29 +00:00
reimar
780e75dd68 Variables for OSD support should be static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13600 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 12:26:58 +00:00
reimar
274c433f07 OpenGL OSD rendering for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13586 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-08 19:53:11 +00:00
reimar
fb4299aa23 10l compilation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13577 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-06 19:53:16 +00:00
reimar
4131acb7ff fixed UNPACK_ALIGNMENT setting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13576 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-06 16:48:19 +00:00
reimar
0a2999f9f4 improved suboption parsing, fixes also compiler warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13238 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-03 12:12:17 +00:00
reimar
ef6466d9ad Using updated colorspace specifications from colorspaces.txt.
All by manyfmts suboption supported formats should display correctly now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13207 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-30 21:06:52 +00:00
rathann
d9a5e00183 small gcc warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13189 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-28 20:59:49 +00:00
reimar
d7d2ea1551 removed saver_on, saver_off calls, they are already in x11_common.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-25 12:49:01 +00:00
reimar
4eebc5af53 changed misleading TEXTUREFORMAT_32BPP (was 24bpp!) to vo_gl2 style TEXTUREFORMAT_ALWAYS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12844 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-17 14:32:22 +00:00
reimar
7eb4b975ed removed XFlush() before XSync()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12750 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-02 16:16:46 +00:00
reimar
ca4e501dc0 changes to get manyfmts nearer to working and fixed memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12446 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 21:38:41 +00:00