# HG changeset patch
# User reimar
# Date 1261255495 0
# Node ID f1651b3af651ff23ba079c5d52dab1b9cc904a48
# Parent  868442ec038e095d7938f8d0e2c6dc79500045c9
Enable running fragment programs with YUV_CONVERSION_NONE

diff -r 868442ec038e -r f1651b3af651 libvo/gl_common.c
--- a/libvo/gl_common.c	Sat Dec 19 15:41:47 2009 +0000
+++ b/libvo/gl_common.c	Sat Dec 19 20:44:55 2009 +0000
@@ -1408,6 +1408,8 @@
     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 @@
  * \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 @@
     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 @@
  * \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 @@
     case YUV_CONVERSION_FRAGMENT_LOOKUP:
     case YUV_CONVERSION_FRAGMENT_POW:
     case YUV_CONVERSION_FRAGMENT:
+    case YUV_CONVERSION_NONE:
       Disable(GL_FRAGMENT_PROGRAM);
       break;
   }