Mercurial > mplayer.hg

changeset 18896:4f6312855a7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT, this can also cause problems.
author reimar
date Tue, 04 Jul 2006 16:31:45 +0000
parents 79efd1a9347d
children 78547a882a09
files libvo/vo_gl.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Tue Jul 04 09:37:54 2006 +0000
+++ b/libvo/vo_gl.c	Tue Jul 04 16:31:45 2006 +0000
@@ -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,