Commit Graph

66 Commits

Author SHA1 Message Date
reimar c9c2f7332e Add a new GPU-based scaling method to vo gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22507 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 14:59:08 +00:00
reimar 5c656ebbc8 The fragment program functions are and most likely always will be ARB-only,
so do not check for other function name variants.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22344 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 16:07:51 +00:00
reimar 29a164309f Fix compilation under MinGW with X11 enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-17 12:33:09 +00:00
reimar 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
reimar 7df98a0a3d Put files fully owned by my under GPL v2 "or later"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:03:33 +00:00
reimar b0b702f667 Some more documentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19226 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 19:37:49 +00:00
reynaldo db5487225c marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19199 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 17:35:06 +00:00
reimar da1390fcc0 Simplify and and speedup generation of yuv2rgb and gamma map tables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19172 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-23 15:19:59 +00:00
reimar c0fc839f3a Fix off-by-one error for negative strides (flipped image)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18993 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 12:06:41 +00:00
reimar 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
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 42efe0d376 reduce number of texture indirections to support older cards
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18790 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-22 17:02:42 +00:00
reimar 36c071082a Do not use border for bicubic filter helper texture, since it will cause ATI
cards to switch to software mode and be unusable. Double texture size to avoid
this causing artefacts.
Note: yuv=6 will not be changed, so it will stay unusable with ATI cards unless
ATI starts supporting this.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18696 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-13 19:55:20 +00:00
reimar 747dac29a9 Optimize bicubic filtering
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18689 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-12 16:25:05 +00:00
reimar 04955c22fd fix image adjustment (brightness etc.) for yuv=6
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18677 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 10:08:40 +00:00
reimar 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
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 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
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 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
reimar 6f748d9621 more GL extension checks to avoid crashes with Mesa
(those crashes are against OpenGL spec though).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18578 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 11:23:51 +00:00
reimar 0ae8d69733 show OpenGL extension string with -v, very helpful for debugging
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18496 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 23:06:18 +00:00
reimar 02f41cc9f6 glBindTexture might be called glBindTextureEXT as well
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18495 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 23:03:19 +00:00
reimar 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
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 065b21ac70 avoid Solaris 10 compile error with gcc 3.4.5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17420 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 20:25:42 +00:00
reimar 05db92a86c avoid some gcc 4 compiler warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17337 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-07 19:56:55 +00:00
reimar c9c88c1530 Less ugly and easier to extend getFunctions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17336 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-07 19:53:51 +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 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 a1d62bbb62 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17020 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-19 14:00:35 +00:00
reimar 68ecbc34f1 disable *SwapInterval function when extensions are missing, since it
can cause crashes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16985 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-13 21:53:26 +00:00
reimar 4acdc86503 do not call glFinish when we do not have a context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16945 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-07 21:29:38 +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 6b95575c06 Make fragment program snprintf less confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16649 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-03 14:25:04 +00:00
reimar 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
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 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
reimar f384349dfb contrast 0 should lead to a grey, not a black image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16590 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:17:03 +00:00
reimar d06ea270be get rid of global getProcAddress variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16589 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:12:01 +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 408a146a4e texture units do not need to be explicitly enabled when using a fragment
program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16583 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 13:56:42 +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 28ee54a940 Use GL_CLAMP_TO_EDGE instead of GL_CLAMP to avoid border texels being sampled.
This avoids some ugly effects when vo_gl2 uses multiple textures.
(Note to self: read the specs instead of just copying the old code!).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16462 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-12 15:15:28 +00:00
reimar 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
reimar 703189e5ea Set texture border color to avoid weird border colors in some rare cases.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16438 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 17:08:26 +00:00
reimar 6c536df1d0 Fix a typo in a comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16436 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 15:54:09 +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