From 4bc8d91bc99eae37c5c9fdd9455ef4f594d14d34 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 8 Jul 2006 19:29:04 +0000
Subject: [PATCH] customtrect -vo gl suboption

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18968 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/man/en/mplayer.1 | 3 +++
 libvo/vo_gl.c         | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 688d1c1f65..ec25ec8efa 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3146,6 +3146,9 @@ This can be used in combination with yuv=4 or with the customprog option.
 .IPs (no)customtlin
 If enabled (default) use GL_LINEAR interpolation, otherwise use GL_NEAREST
 for customtex texture.
+.IPs (no)customtrect
+If enabled, use texture_rectangle for customtex texture.
+Default is disabled.
 .REss
 .RE
 .PD 1
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 8e28af9296..616e27490c 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -84,6 +84,7 @@ static GLuint default_texs[22];
 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 @@ static void update_yuvconv(void) {
     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 @@ static opt_t subopts[] = {
   {"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 @@ static int preinit(const char *arg)
     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 @@ static int preinit(const char *arg)
               "    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" );