diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-04 16:31:45 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-04 16:31:45 +0000 |
| commit | f07aeccfc7753b48c8b5725af9c4889dbbf55ecd (patch) | |
| tree | 4484c98ebddbf9bb5acb3c868cb01d125613e184 /libvo | |
| parent | f1b93202b0c6ce92afbf9c1ea1ed45eb05c29430 (diff) | |
| download | mpv-f07aeccfc7753b48c8b5725af9c4889dbbf55ecd.tar.bz2 mpv-f07aeccfc7753b48c8b5725af9c4889dbbf55ecd.tar.xz | |
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
this can also cause problems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18901 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 443e57f8cd..36142063ad 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -80,7 +80,7 @@ static GLenum gl_type; 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 @@ static int initGl(uint32_t d_width, uint32_t d_height) { 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, |