Commit Graph

139 Commits

Author SHA1 Message Date
reimar 6ec6374d6f Cosmetics: reindent, remove tabs and break overlong lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19586 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 20:38:31 +00:00
reimar 6fd61e1c4c Cosmetics: fix indentation after last patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19585 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 20:21:04 +00:00
reimar c92e065c1e Hardware EOSD (ass) support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 20:17:42 +00:00
reimar c7d8e7abfa Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19362 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-08 14:56:12 +00:00
reimar b46347bd28 vo_gl can do flipping without special filter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19001 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 18:36:50 +00:00
reimar e473bae3df Fix negative stride handling in -dr case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19000 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 18:35:29 +00:00
reimar a677c0b41f Get rid of left-over incorrect UnmapBuffer hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18999 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 18:33:34 +00:00
reimar 4bc8d91bc9 customtrect -vo gl suboption
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18968 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 19:29:04 +00:00
reimar d1cbef4d86 More helpful ProgramEnvParameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18965 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 19:22:36 +00:00
reimar 01d5289203 Improve windows gui support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 15:00:37 +00:00
reimar f07aeccfc7 Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
this can also cause problems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18901 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-04 16:31:45 +00:00
reynaldo 9d9a15d185 rm unnecesary casts from void* - part 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-02 03:59:36 +00:00
reimar efd13273f9 Get rid of unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18877 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 10:59:21 +00:00
reimar 0da07e3724 Make sure all texture units have a different texture bound.
Should fix weird behaviour with e.g. yuv=4:lscale=1


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18876 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 10:58:32 +00:00
reimar db92e7a6b7 remove pointless and sometimes incorrect lookupTex stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18791 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-22 17:05:08 +00:00
reimar 580302e179 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18722 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-15 08:43:41 +00:00
reimar 2741e50f20 Document lscale/cscale in -vo gl:help message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18698 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-13 20:30:16 +00:00
reimar 2a61cc675b loadGPUProgram function to load fragment program with error checking and statistics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18654 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-08 18:50:11 +00:00
reimar 0965bcee43 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 13:24:54 +00:00
reimar fbae2ba72b Move/add checks to avoid crashes and make error messages less confusing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18580 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 11:45:33 +00:00
reimar 7f3d9de556 Fix and improve xinerama support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-16 13:38:28 +00:00
reimar d96b09cd64 fixes and cleanup for windows fullscreen switching (restore old position,
fullscreen on current monitor).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18080 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-12 14:11:26 +00:00
reimar 97600b8ee0 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-26 10:43:56 +00:00
reimar 33f64f9e05 extra checks on size of OSD parts (though IMHO these values should never be bad)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17876 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-15 21:13:13 +00:00
reimar cf1e2325c3 do not call glDeleteTextures with 0 count, Xgl does not like it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17872 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-15 12:15:35 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar 2a15e8beb8 support negative stride (flipping) in vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17221 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 12:04:08 +00:00
reimar 2d065d1c6d signed division must be used for calculation vo_dx and vo_dy.
Fixes a bug that causes overbig windows to disappear on Windows.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17128 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 15:56:27 +00:00
reimar cd8e16a22e Must use glFlush when doublebuffering is not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17118 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 22:35:54 +00:00
reimar 6b9f08f720 Get rid of most #ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17117 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 22:23:06 +00:00
reimar 57bd6e2d5b Use slice-height 16 as default for yuv colorspaces (only relevant if decoder
does not support slice rendering).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17028 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 16:18:34 +00:00
reimar 28b32a786a Enable border toggling for gl and gl2 under windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17007 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-17 20:49:46 +00:00
reimar 99f1babca7 10l typo, nomanyfmts should be used against playback problems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16881 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 13:57:37 +00:00
reimar 1b6809f326 More consistent and sane types. Also avoids some gcc 4 warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16880 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 13:56:16 +00:00
reimar fc96ad08af Be less verbose.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16752 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 19:15:30 +00:00
reimar 1a3e0c3b12 documentation update.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16627 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-01 12:53:49 +00:00
reimar 7a3909684e fix/improve code doxumentation. Also group gl_common functions in several
doxygen modules


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16596 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:41:28 +00:00
reimar e74494dd4d Allow specifying a custom (ppm) texture for texture unit 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16594 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:31:58 +00:00
reimar d16d2c3e32 Support rectangular texture in fragment programs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16587 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:07:54 +00:00
reimar b008020536 Several bugfixes:
black OSD border with scaled-osd
draw only used parts of image (looks weird with equalizer controls otherwise)
clear borders when switching to fullscreen when using -nodouble


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16585 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 14:02:02 +00:00
reimar 4e60e039f5 hardware color-space conversion for vo_gl and vo_gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16489 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-14 22:08:04 +00:00
reimar 587c45e08e Improved glFindFormat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16475 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 15:56:32 +00:00
reimar 4de258aac4 Respect -nodouble even though it looks very bad.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16459 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-11 17:45:12 +00:00
reimar 904448cec5 Add missing doxygen comment for clearOSD()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16437 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 16:43:18 +00:00
reimar be2b214c35 gl_buffer should be unsigned
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16435 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 14:49:13 +00:00
reimar bb0c8b3df5 Add an uninit function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16434 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 14:47:54 +00:00
reimar 6220c8e924 Properly initialize osdtexCnt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16398 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-05 10:08:04 +00:00
reimar 3561e3a980 OSD alpha conversion index out of range
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16397 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-05 10:02:06 +00:00
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