diff options
| author |  reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 20:44:55 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 20:44:55 +0000 |
| commit | 213707b9e4efb2c1c524b1541fe3e8843576438a (patch) | |
| tree | b5f4acb95270571c77614c5bb27bf54f6d61fec8 /libvo | |
| parent | bfd01bdc1700bac53392dc827f3f7870124d0406 (diff) | |
Enable running fragment programs with YUV_CONVERSION_NONE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30069 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/gl_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index f1da5cfaa7..bb79c6246d 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1408,6 +1408,8 @@ void glSetupYUVConversion(gl_conversion_params_t *params) { case YUV_CONVERSION_FRAGMENT_POW: glSetupYUVFragprog(params); break; + case YUV_CONVERSION_NONE: + break; default: mp_msg(MSGT_VO, MSGL_ERR, "[gl] unknown conversion type %i\n", YUV_CONVERSION(params->type)); } @@ -1420,7 +1422,6 @@ void glSetupYUVConversion(gl_conversion_params_t *params) { * \ingroup glconversion */ void glEnableYUVConversion(GLenum target, int type) { - if (type <= 0) return; switch (YUV_CONVERSION(type)) { case YUV_CONVERSION_COMBINERS: ActiveTexture(GL_TEXTURE1); @@ -1442,6 +1443,7 @@ void glEnableYUVConversion(GLenum target, int type) { case YUV_CONVERSION_FRAGMENT_LOOKUP: case YUV_CONVERSION_FRAGMENT_POW: case YUV_CONVERSION_FRAGMENT: + case YUV_CONVERSION_NONE: Enable(GL_FRAGMENT_PROGRAM); break; } @@ -1454,7 +1456,6 @@ void glEnableYUVConversion(GLenum target, int type) { * \ingroup glconversion */ void glDisableYUVConversion(GLenum target, int type) { - if (type <= 0) return; switch (YUV_CONVERSION(type)) { case YUV_CONVERSION_COMBINERS: ActiveTexture(GL_TEXTURE1); @@ -1476,6 +1477,7 @@ void glDisableYUVConversion(GLenum target, int type) { case YUV_CONVERSION_FRAGMENT_LOOKUP: case YUV_CONVERSION_FRAGMENT_POW: case YUV_CONVERSION_FRAGMENT: + case YUV_CONVERSION_NONE: Disable(GL_FRAGMENT_PROGRAM); break; } |