[MPlayer-cvslog] r18968 - in trunk: DOCS/man/en/mplayer.1 libvo/vo_gl.c

[reimar]

Author: reimar
Date: Sat Jul  8 21:29:04 2006
New Revision: 18968

Modified:
   trunk/libvo/vo_gl.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Log:
customtrect -vo gl suboption


Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Sat Jul  8 21:29:04 2006
@@ -84,6 +84,7 @@
 static char *custom_prog;
 static char *custom_tex;
 static int custom_tlin;
+static int custom_trect;
 
 static int int_pause;
 static int eq_bri = 0;
@@ -188,7 +189,7 @@
     else {
       int width, height, maxval;
       ActiveTexture(GL_TEXTURE3);
-      if (glCreatePPMTex(GL_TEXTURE_2D, 3,
+      if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0,
                      custom_tlin?GL_LINEAR:GL_NEAREST,
                      f, &width, &height, &maxval))
         ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1,
@@ -706,6 +707,7 @@
   {"customprog",   OPT_ARG_MSTRZ,&custom_prog,  NULL},
   {"customtex",    OPT_ARG_MSTRZ,&custom_tex,   NULL},
   {"customtlin",   OPT_ARG_BOOL, &custom_tlin,  NULL},
+  {"customtrect",  OPT_ARG_BOOL, &custom_trect, NULL},
   {"osdcolor",     OPT_ARG_INT,  &osd_color,    NULL},
   {NULL}
 };
@@ -727,6 +729,7 @@
     custom_prog = NULL;
     custom_tex = NULL;
     custom_tlin = 1;
+    custom_trect = 0;
     osd_color = 0xffffff;
     if (subopt_parse(arg, subopts) != 0) {
       mp_msg(MSGT_VO, MSGL_FATAL,
@@ -769,6 +772,8 @@
               "    use a custom YUV conversion lookup texture\n"
               "  nocustomtlin\n"
               "    use GL_NEAREST scaling for customtex texture\n"
+              "  customtrect\n"
+              "    use texture_rectangle for customtex texture\n"
               "  osdcolor=<0xRRGGBB>\n"
               "    use the given color for the OSD\n"
               "\n" );