[MPlayer-cvslog] r18901 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Tue Jul  4 18:31:45 2006
New Revision: 18901

Modified:
   trunk/libvo/vo_gl.c

Log:
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
this can also cause problems.


Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Tue Jul  4 18:31:45 2006
@@ -80,7 +80,7 @@
 static GLuint gl_buffer;
 static int gl_buffersize;
 static GLuint fragprog;
-static GLuint default_texs[8];
+static GLuint default_texs[22];
 static char *custom_prog;
 static char *custom_tex;
 static int custom_tlin;
@@ -261,13 +261,13 @@
 
   if (image_format == IMGFMT_YV12) {
     int i;
-    glGenTextures(7, default_texs);
-    default_texs[7] = 0;
+    glGenTextures(21, default_texs);
+    default_texs[21] = 0;
     for (i = 0; i < 7; i++) {
       ActiveTexture(GL_TEXTURE1 + i);
       BindTexture(GL_TEXTURE_2D, default_texs[i]);
-      BindTexture(GL_TEXTURE_RECTANGLE, default_texs[i]);
-      BindTexture(GL_TEXTURE_3D, default_texs[i]);
+      BindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]);
+      BindTexture(GL_TEXTURE_3D, default_texs[i + 14]);
     }
     ActiveTexture(GL_TEXTURE1);
     glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR,