6c9d09170d
vo_gl[2]: Rename conflicting vo_ontop macro
...
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).
2008-04-23 13:41:06 +03:00
37ea342f85
#include config.h before all other headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-14 16:46:13 +00:00
c5001347c2
This header uses parts of stdint.h, so #include it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 20:25:26 +00:00
d04df10807
Add missing header #includes to fix 'make checkheaders'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26194 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 20:07:15 +00:00
8efb2fa21c
Add MPLAYER_ prefix to multiple inclusion guards.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
6a6c3d8cbc
Add a fragment program for 5x5 unsharp masking
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-18 19:05:29 +00:00
1fbd767ef6
Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25757 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-15 17:59:20 +00:00
fba0b66ff9
Add explanatory comments to the #endif part of multiple inclusion guards.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
dc804a9536
Add a bicubic scaler that needs a lot more instruction but no
...
extra texture lookup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24338 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-04 10:46:31 +00:00
3e9e4acd8d
Do not use leading underscores in multiple inclusion guards, they are reserved.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
d32650a87c
forgotten lscale=2 part for gl_common.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22509 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 15:32:48 +00:00
4f6a65ef4e
Avoid void * arithmetic
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21217 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 13:34:55 +00:00
e799a08925
Support for 16 bit ppms
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18966 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 19:23:26 +00:00
497b2f561e
Add yuv to rgb conversion using a 3D lookup texture
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18656 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-08 19:02:56 +00:00
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
1b0b329dd7
Add bicubic texture scaling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18623 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 14:07:32 +00:00
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
a0a494e6f2
add (currently unused) lookup for glTexImage3D
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18579 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 11:26:33 +00:00
19935f69bd
minor fixes: get rid of pointless inline attributes and some additional checks
...
fo ppm reading
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18176 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-21 18:46:17 +00:00
1c45f83cac
Better fallback for APIENTRY when compiling for Windows
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17689 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-26 09:47:17 +00:00
d18baca45c
workaround for gl.h variants that do not define APIENTRY
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17669 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-23 10:18:10 +00:00
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
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
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
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
d28ad7d31d
Support for ATI specific YUV->RGB conversion.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16626 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-01 12:49:28 +00:00
9f24b5c71f
Add missing GL_REGISTER_COMBINERS_NV define
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16609 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-27 08:33:33 +00:00
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
d29c9ddf19
support loading a texture from a PPM file
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16593 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:30:00 +00:00
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
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
7a84b40ce4
Fix border color (forgot to divide by 255.0).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16461 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-12 14:51:30 +00:00
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
5da34263f6
Fix crash in windows
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16271 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 12:09:44 +00:00
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
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
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
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
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
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
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
84fd90d3e4
Improving gl2 under windows, moving some functionality to gl_common
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14143 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-11 16:57:42 +00:00
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
20a0913dee
added missing declaration of releaseGlContext
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13922 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-11 19:41:08 +00:00
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
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
Uoti Urpala
diego
reimar
rathann