Commit Graph

50 Commits

Author SHA1 Message Date
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
reimar 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
reimar 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
reimar 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
reimar 0ddf170917 extra check for glUploadTex to avoid a possible hang.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16224 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:38:16 +00:00
reimar c7888c0a7f remove/move some unused headers/variables/code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16222 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:24:49 +00:00
reimar 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
reimar 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
reimar 58eab3c054 Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
compile everywhere since the gl/glx headers are such a mess...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16112 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 18:28:51 +00:00
reimar 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
reimar 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
reimar f9258247dd Doxygen comments improved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14270 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 14:33:40 +00:00
reimar 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
reimar 302ddb0e51 Make the context not current before destroying it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14090 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-02 23:55:08 +00:00
reimar 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
reimar 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
reimar 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