summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl2.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+1
|\ | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-1/+17
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-1/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-8/+0
|\|
| * Factor common code like -wid handling, vo_gc creation etc. out intoreimar2008-11-191-8/+0
| | | | | | | | | | | | | | x11_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-3/+0
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Remove explicit setting of vo_ontop since that is already done by ↵reimar2008-11-151-3/+0
| | | | | | | | | | | | vo_x11_create_vo_window git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-0/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Surround conditionally used function with corresponding #ifdef, fixes:diego2008-10-131-0/+2
| | | | | | | | | | | | | | libvo/vo_gl2.c:681: warning: 'gl_handlekey' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27754 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-021-3/+3
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * Change glCreateClearTex to use the same host data format as later uploads.reimar2008-09-201-3/+3
| | | | | | | | | | | | | | This fixes at least some of the massive performance problems the ATI drivers have. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:diego2008-07-301-3/+3
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27347Uoti Urpala2008-07-251-3/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts.
| * Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.reimar2008-07-221-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * Use a struct instead of a huge and further growing argument list.reimar2008-05-241-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26866 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Saner handling of VOCTRL_PAUSE/VOCTRL_RESUMEreimar2008-05-221-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26855 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from from return statements.diego2008-05-161-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_gl[2]: Rename conflicting vo_ontop macroUoti Urpala2008-04-231-1/+1
| | | | | | | | | | | | | | | | Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with other changes because it conflicts with a global variable name (gl2 actually called vo_ontop() as a function and used vo_ontop as an int - this only worked because vo_ontop was defined as a function-like macro and use without parentheses didn't trigger replacement).
* | Remove variable arguments from vo control() functionsUoti Urpala2008-04-231-1/+1
| | | | | | | | | | No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder.
* | Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-231-14/+4
|/ | | | | | | | These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code.
* Set vo_mouse_autohide in gl and gl2 vos, so the mouse hiding behaviourreimar2007-12-221-0/+1
| | | | | | | becomes the same as for the other vos using X11. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25513 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.diego2007-12-161-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark the vo_functions_t definitions as const where possible.reimar2007-12-021-1/+1
| | | | | | | | This is not possible for xover and anything supporting vidix due to horrible hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make vo info structs constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after patch to remove global vo_hdcreimar2007-09-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make X11 window creation and (with -fixed-vo) management simpler and morereimar2007-06-271-44/+3
| | | | | | | | | consistent by introducing a new function that handles most of the ugly things. Changes of behaviour with some vos is unavoidable, bug reports welcome. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
* Lots of cosmetics for gl2reimar2007-06-261-329/+283
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23671 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove two unused variablesreimar2007-06-261-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23670 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove overly complex and unused per-subtexture "dirty" handlingreimar2007-06-261-77/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23669 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove now unused variablereimar2007-06-261-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23668 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove useless calloc castreimar2007-06-261-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23667 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused code and useless error checking that only clutters the codereimar2007-06-261-56/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23665 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set classhint directly after creating window just as all other vos do, in ↵reimar2007-02-181-3/+3
| | | | | | | | | accordance with ICCCM. Patch by Mark Tiefenbruck [mark at fluxbox org] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22266 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common vo initialization code to video_out.creimar2007-02-171-15/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation under MinGW with X11 enabledreimar2006-12-171-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improve windows gui supportreimar2006-07-081-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make header include order more similar to vo_gl.creimar2006-06-171-3/+2
| | | | | | | Patch by Erik Lunchpail (erik_27can at yahoo com) to ease win32 gui compilation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18745 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reworked YUV2RGB fragment program setup in preparation for upcoming patchesreimar2006-06-071-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18620 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are ↵reimar2006-06-051-0/+4
| | | | | | | | | available Fix "ported" from vo_gl.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18585 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix and improve xinerama supportreimar2006-04-161-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes and cleanup for windows fullscreen switching (restore old position,reimar2006-04-121-9/+1
| | | | | | | fullscreen on current monitor). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18080 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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
* support negative stride (flipping) in vo_gl.reimar2005-12-181-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17221 b3059339-0415-0410-9bf9-f77b7e298cf2
* signed division must be used for calculation vo_dx and vo_dy.reimar2005-12-071-2/+2
| | | | | | | 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
* Get rid of most #ifdefsreimar2005-12-061-34/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17117 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable border toggling for gl and gl2 under windows.reimar2005-11-171-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17007 b3059339-0415-0410-9bf9-f77b7e298cf2
* documentation update.reimar2005-10-011-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16627 b3059339-0415-0410-9bf9-f77b7e298cf2
* debugging/testing helpers: allow forcing a certain width/height for texturesreimar2005-09-251-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16595 b3059339-0415-0410-9bf9-f77b7e298cf2
* panscan supportreimar2005-09-251-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support rectangular texture in fragment programsreimar2005-09-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16587 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crashes and green border when using YV12 input formatreimar2005-09-251-11/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16584 b3059339-0415-0410-9bf9-f77b7e298cf2
* hardware color-space conversion for vo_gl and vo_gl2reimar2005-09-141-2/+114
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow disabling the glFinish callreimar2005-09-131-5/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix texture format variable types. Internal format is GLint, others are GLenumreimar2005-08-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
* -wid support for windows. Not well tested, might still behave a bit weird.reimar2005-08-211-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16283 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get events from -wid window.reimar2005-08-161-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16240 b3059339-0415-0410-9bf9-f77b7e298cf2
* use glUploadTex helper functionreimar2005-08-141-12/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16225 b3059339-0415-0410-9bf9-f77b7e298cf2
* textures smaller 64x64 might not be supportedreimar2005-08-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16223 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove/move some unused headers/variables/codereimar2005-08-141-11/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16222 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, texture_width/height initialization was removed, so usereimar2005-08-141-2/+2
| | | | | | | image_width/height here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16221 b3059339-0415-0410-9bf9-f77b7e298cf2
* Helper function for drawing texture and general cleanup of vo_gl2.creimar2005-08-141-129/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16215 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the return types of all (six) libvo API functions. Used to be uint32_t, butivo2005-08-051-6/+6
| | | | | | | | 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
* support -widreimar