93336619b2
vo_gl: add helper macros to build the yuv conversion type number
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31742 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
7de77cdb11
gl_common.h: Add () around macro arguments.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31741 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
ccb6675fbd
vo_gl: Add initial stereo support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31633 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
be6a58d455
vo_gl, csputils: dual-license under LGPL v2.1
...
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
an alternative to the GPL license.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31375 b3059339-0415-0410-9bf9-f77b7e298cf2
Allow LGPL for csputils as well, they were previously part of gl_common
and are still an important part of it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31376 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
eee666c3b5
Merge svn changes up to r31133
2010-05-07 21:19:53 +03:00
9d3c096045
Avoid duplicating the GL/gl.h include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31107 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-30 19:03:13 +00:00
f38efd166e
Merge svn changes up to r31097
2010-04-26 19:23:32 +03:00
7795726e0f
Merge svn changes up to r31033
2010-04-26 18:25:34 +03:00
837c48ddee
Merge svn changes up to r31020
2010-04-26 18:06:00 +03:00
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
a9ff7793e3
Support for auto-selecting the OpenGL backend.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:53:01 +00:00
e9ef1cbda0
Missing gl.h include for SDL backend.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31070 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 22:35:39 +00:00
6e4458ffa3
First steps to support -vo gl with SDL-based Window handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31062 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 16:46:47 +00:00
8305385bb7
Add some fallback OpenGL defines to fix compilation on Windows.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31027 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-07 19:36:23 +00:00
b8a7ed8a79
Factor out the YUV->RGB conversion auto-selection and also
...
enable auto-selection of ATI fragment shaders since they
should do accurate conversions now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:56:30 +00:00
269b96d75e
Implement OpenGL-based YUV to RGB version for Radeon 9200 class
...
cards on OS X.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 19:58:06 +00:00
2cebf8eeb7
Add mpgl prefix to all OpenGL-related function pointers.
...
This is necessary because at least the GetString symbol
causes clashes on PPC OSX 10.4, causing -vo gl to always
crash.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 07:08:07 +00:00
b390b9b28f
Merge svn changes up to r30185
2010-01-08 01:36:05 +02:00
231b33a02f
Merge svn changes up to r30165
2010-01-08 01:05:30 +02:00
f06aa83a83
Add pointers to a few more standard OpenGL functions to ease future extensions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 12:55:09 +00:00
0ecf324ac5
Extract functions to generate yuv->rgb matrices and lookup tables into a
...
separate file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +00:00
c4c806a9d7
Put the colourspace-related variables into a separate struct to ease
...
extracting the code and sharing with other vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:07:37 +00:00
8e35068138
Support all planar YUV formats in OpenGL vos.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 11:32:24 +00:00
dc7f183022
Merge svn changes up to r30104
...
Ignore the broken correct-pts change in r30100.
2009-12-30 00:14:20 +02:00
67b40bd219
Merge svn changes up to r30065
2009-12-29 23:57:14 +02:00
763402d423
Define GL_GENERATE_MIPMAP ourselves if necessary.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30074 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 21:07:42 +00:00
f97fd3eff0
Rename GL_* defines to CONFIG_GL_*
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 13:49:44 +00:00
140de2a9e2
Make the check for X11 and WIN32 backends for OpenGL separate.
...
This fixes compilation on Windows with X11 but no GLX available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 10:52:32 +00:00
efcc9ad712
Merge svn changes up to r30055
2009-12-18 18:54:42 +02:00
c13aaf85d1
Prefer GLAPIENTRY over APIENTRY, it is the better name and used more by OpenGL headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29983 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 17:36:55 +00:00
e64d47925a
Pass all OpenGL functions through a function pointer indirection.
...
This still needs more work, but should allow supporting e.g. GLX-OpenGL
and Win32-OpenGL with a single binary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29981 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-08 23:32:51 +00:00
2661039ada
Very preliminary code to allow selecting the OpenGL backend at runtime.
...
Works in the currently supported cases for only Win32 and only X11,
the mixed case is not working yet though.
But applied anyway since the code is slightly less messy than the current one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29980 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-08 06:42:46 +00:00
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
1e86963828
Merge svn changes up to r28537
2009-02-12 04:17:55 +02:00
befc528297
Add standard license headers, unify header formatting.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
39f24a83c7
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:18:57 +00:00
cb3dc68691
Merge svn changes up to r28103
2008-12-06 02:16:51 +02:00
b6e113841c
Add experimental support for glXAllocateMemoryMESA
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 22:16:45 +00:00
0ca415447d
Add support for YCBCR MESA texture format to vo_gl.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:36:54 +00:00
e46ce9c0ac
Merge svn changes up to r27899
2008-11-06 20:41:40 +02:00
14eb21fce0
For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-06 18:39:37 +00:00
c9f2a3636c
Change OpenGL support to work on unmodified MinGW64
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27879 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 16:37:45 +00:00
ebb4abf208
Merge svn changes up to r27682
...
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
2008-10-02 05:17:23 +03:00
0e99017da9
Change glCreateClearTex to use the same host data format as later uploads.
...
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
2008-09-20 17:48:01 +00:00
3a69d65f8d
Merge svn changes up to r27347
...
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.
2008-07-25 02:50:58 +03:00
983800b76f
Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:46:07 +00:00
d5c868325c
Merge svn changes up to r26979
...
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
2008-06-04 08:10:48 +03:00
6689fe364e
Add a filter strength parameter for blurring/sharpening scalers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 11:19:38 +00:00
reimar
Uoti Urpala
diego
Uoti Urpala