summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+18
|\
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-0/+3
|\|
| * 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.reimar2008-12-061-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28103Uoti Urpala2008-12-061-0/+11
|\|
| * Add experimental support for glXAllocateMemoryMESAreimar2008-12-051-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for YCBCR MESA texture format to vo_gl.reimar2008-12-051-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-061-2/+32
|\|
| * For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of ↵reimar2008-11-061-0/+3
| | | | | | | | | | | | GL_MAX_TEXTURE_UNITS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change OpenGL support to work on unmodified MinGW64reimar2008-11-021-2/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27879 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-021-1/+1
|\| | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | 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 r27347Uoti Urpala2008-07-251-0/+2
|\| | | | | | | | | | | | | | | | | | | | | 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-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-5/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add a filter strength parameter for blurring/sharpening scalers.reimar2008-05-241-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten changes to gl_common.hreimar2008-05-241-5/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26867 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_gl[2]: Rename conflicting vo_ontop macroUoti Urpala2008-04-231-2/+2
|/ | | | | | | | 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).
* #include config.h before all other headers.diego2008-03-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
* This header uses parts of stdint.h, so #include it.diego2008-03-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26195 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26194 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a fragment program for 5x5 unsharp maskingreimar2008-01-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.reimar2008-01-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25757 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explanatory comments to the #endif part of multiple inclusion guards.diego2007-12-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a bicubic scaler that needs a lot more instruction but noreimar2007-09-041-0/+2
| | | | | | | extra texture lookup git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24338 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* forgotten lscale=2 part for gl_common.hreimar2007-03-111-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22509 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid void * arithmeticreimar2006-11-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21217 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for 16 bit ppmsreimar2006-07-081-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18966 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add yuv to rgb conversion using a 3D lookup texturereimar2006-06-081-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18656 b3059339-0415-0410-9bf9-f77b7e298cf2
* loadGPUProgram function to load fragment program with error checking and ↵reimar2006-06-081-0/+4
| | | | | | statistics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18654 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add bicubic texture scalingreimar2006-06-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reworked YUV2RGB fragment program setup in preparation for upcoming patchesreimar2006-06-071-1/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18620 b3059339-0415-0410-9bf9-f77b7e298cf2
* add (currently unused) lookup for glTexImage3Dreimar2006-06-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18579 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor fixes: get rid of pointless inline attributes and some additional checksreimar2006-04-211-2/+2
| | | | | | | fo ppm reading git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18176 b3059339-0415-0410-9bf9-f77b7e298cf2
* Better fallback for APIENTRY when compiling for Windowsreimar2006-02-261-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17689 b3059339-0415-0410-9bf9-f77b7e298cf2
* workaround for gl.h variants that do not define APIENTRYreimar2006-02-231-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17669 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17221 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of most #ifdefsreimar2005-12-061-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17117 b3059339-0415-0410-9bf9-f77b7e298cf2
* More consistent and sane types. Also avoids some gcc 4 warnings.reimar2005-10-311-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for ATI specific YUV->RGB conversion.reimar2005-10-011-0/+50
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16626 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing GL_REGISTER_COMBINERS_NV definereimar2005-09-271-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16609 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix/improve code doxumentation. Also group gl_common functions in severalreimar2005-09-251-3/+15
| | | | | | | doxygen modules git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16596 b3059339-0415-0410-9bf9-f77b7e298cf2
* support loading a texture from a PPM filereimar2005-09-251-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support rectangular texture in fragment programsreimar2005-09-251-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16587 b3059339-0415-0410-9bf9-f77b7e298cf2
* hardware color-space conversion for vo_gl and vo_gl2reimar2005-09-141-1/+94
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix border color (forgot to divide by 255.0).reimar2005-09-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix texture format variable types. Internal format is GLint, others are GLenumreimar2005-08-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash in windowsreimar2005-08-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16271 b3059339-0415-0410-9bf9-f77b7e298cf2
* automatic vsync enabling for vo_gl.reimar2005-08-191-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16269 b3059339-0415-0410-9bf9-f77b7e298cf2
* Our buffer usage actually fits better to GL_DYNAMIC_DRAW than GL_STREAM_DRAW.reimar2005-08-161-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16238 b3059339-0415-0410-9bf9-f77b7e298cf2
* use GenBuffers to get a buffer number instead of hardcoding 1.reimar2005-08-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16234 b3059339-0415-0410-9bf9-f77b7e298cf2
* Helper function for drawing texture and general cleanup of vo_gl2.creimar2005-08-141-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16215 b3059339-0415-0410-9bf9-f77b7e298cf2
* More helper functions/defines and bugfixesreimar2005-07-271-0/+30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16118 b3059339-0415-0410-9bf9-f77b7e298cf2
* OpenGL fixes for windows and vo_gl.c ported to windows.reimar2005-07-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16110 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for rectangular and streaming textures.reimar2005-07-261-0/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16100 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improving gl2 under windows, moving some functionality to gl_commonreimar2004-12-111-2/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14143 b3059339-0415-0410-9bf9-f77b7e298cf2
* More similar code from gl and gl2 moved to gl_commonreimar2004-12-011-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14079 b3059339-0415-0410-9bf9-f77b7e298cf2
* added missing declaration of releaseGlContextreimar2004-11-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13922 b3059339-0415-0410-9bf9-f77b7e298cf2
* fullscreen fixes and GUI support for vo_glreimar2004-11-011-0/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13844 b3059339-0415-0410-9bf9-f77b7e298cf2
* added gl_common for code used by both vo_gl.c and vo_gl2.c.reimar2004-10-171-0/+8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13654 b3059339-0415-0410-9bf9-f77b7e298cf2