# HG changeset patch # User reimar # Date 1152030705 0 # Node ID 4f6312855a7db71bb2245b6482f8cd52b5abc2c3 # Parent 79efd1a9347d1199185484eafcf44e96512c7d37 Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT, this can also cause problems. diff -r 79efd1a9347d -r 4f6312855a7d libvo/vo_gl.c --- 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,