diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-22 17:05:08 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-22 17:05:08 +0000 |
| commit | db92e7a6b717e61f9abbe2335504c6549da035d8 (patch) | |
| tree | 0af06db89fb40d33530818526728df33a6a2afd5 /libvo | |
| parent | 42efe0d37619258651e1f6fd2ae3c6812927f704 (diff) | |
| download | mpv-db92e7a6b717e61f9abbe2335504c6549da035d8.tar.bz2 mpv-db92e7a6b717e61f9abbe2335504c6549da035d8.tar.xz | |
remove pointless and sometimes incorrect lookupTex stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18791 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index c57be46739..d1803379f4 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -81,7 +81,6 @@ static GLuint gl_buffer; static int gl_buffersize; static GLuint fragprog; static GLuint uvtexs[2]; -static GLuint lookupTex; static char *custom_prog; static char *custom_tex; static int custom_tlin; @@ -231,9 +230,6 @@ static void uninitGl(void) { if (uvtexs[0] || uvtexs[1]) glDeleteTextures(2, uvtexs); uvtexs[0] = uvtexs[1] = 0; - if (lookupTex) - glDeleteTextures(1, &lookupTex); - lookupTex = 0; clearOSD(); if (DeleteBuffers && gl_buffer) DeleteBuffers(1, &gl_buffer); @@ -247,7 +243,7 @@ static void uninitGl(void) { */ static int initGl(uint32_t d_width, uint32_t d_height) { osdtexCnt = 0; gl_buffer = 0; gl_buffersize = 0; err_shown = 0; - fragprog = 0; uvtexs[0] = 0; uvtexs[1] = 0; lookupTex = 0; + fragprog = 0; uvtexs[0] = 0; uvtexs[1] = 0; texSize(image_width, image_height, &texture_width, &texture_height); glDisable(GL_BLEND); @@ -273,9 +269,6 @@ static int initGl(uint32_t d_width, uint32_t d_height) { texture_width / 2, texture_height / 2, 128); switch (use_yuv) { case YUV_CONVERSION_FRAGMENT_LOOKUP: - glGenTextures(1, &lookupTex); - ActiveTexture(GL_TEXTURE3); - glBindTexture(GL_TEXTURE_2D, lookupTex); case YUV_CONVERSION_FRAGMENT_POW: case YUV_CONVERSION_FRAGMENT: if (!GenPrograms || !BindProgram) { |