Mercurial > mplayer.hg

changeset 18788:8c64e049d64b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove pointless and sometimes incorrect lookupTex stuff
author reimar
date Thu, 22 Jun 2006 17:05:08 +0000
parents 5a2e45cd754f
children dbe4b8e31c58
files libvo/vo_gl.c
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Thu Jun 22 17:02:42 2006 +0000
+++ b/libvo/vo_gl.c	Thu Jun 22 17:05:08 2006 +0000
@@ -81,7 +81,6 @@
 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 @@
   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 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 @@
                      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) {