[MPlayer-cvslog] r34149 - in trunk/libvo: gl_common.c gl_common.h vo_gl.c vo_gl2.c

[reimar]

Author: reimar
Date: Wed Sep 28 20:52:11 2011
New Revision: 34149

Log:
Remove usage of glColor3f, there is not really a point in it.

Modified:
   trunk/libvo/gl_common.c
   trunk/libvo/gl_common.h
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_gl2.c

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	Wed Sep 28 20:26:18 2011	(r34148)
+++ trunk/libvo/gl_common.c	Wed Sep 28 20:52:11 2011	(r34149)
@@ -65,7 +65,6 @@ void (GLAPIENTRY *mpglDeleteTextures)(GL
 void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat);
 void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint);
 void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
-void (GLAPIENTRY *mpglColor3f)(GLfloat, GLfloat, GLfloat);
 void (GLAPIENTRY *mpglColor4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 void (GLAPIENTRY *mpglClearDepth)(GLclampd);
@@ -413,7 +412,6 @@ static const extfunc_desc_t extfuncs[] =
   DEF_FUNC_DESC(TexEnvf),
   DEF_FUNC_DESC(TexEnvi),
   DEF_FUNC_DESC(Color4ub),
-  DEF_FUNC_DESC(Color3f),
   DEF_FUNC_DESC(Color4f),
   DEF_FUNC_DESC(ClearColor),
   DEF_FUNC_DESC(ClearDepth),

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	Wed Sep 28 20:26:18 2011	(r34148)
+++ trunk/libvo/gl_common.h	Wed Sep 28 20:52:11 2011	(r34149)
@@ -461,7 +461,6 @@ extern void (GLAPIENTRY *mpglDeleteTextu
 extern void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat);
 extern void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint);
 extern void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
-extern void (GLAPIENTRY *mpglColor3f)(GLfloat, GLfloat, GLfloat);
 extern void (GLAPIENTRY *mpglColor4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 extern void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 extern void (GLAPIENTRY *mpglClearDepth)(GLclampd);

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Wed Sep 28 20:26:18 2011	(r34148)
+++ trunk/libvo/vo_gl.c	Wed Sep 28 20:52:11 2011	(r34149)
@@ -820,7 +820,7 @@ static void do_render(void) {
 //  Enable(GL_TEXTURE_2D);
 //  BindTexture(GL_TEXTURE_2D, texture_id);
 
-  mpglColor3f(1,1,1);
+  mpglColor4f(1,1,1,1);
   if (is_yuv || custom_prog)
     glEnableYUVConversion(gl_target, yuvconvtype);
   if (stereo_mode) {

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	Wed Sep 28 20:26:18 2011	(r34148)
+++ trunk/libvo/vo_gl2.c	Wed Sep 28 20:52:11 2011	(r34149)
@@ -382,7 +382,7 @@ static void drawTextureDisplay (void)
   struct TexSquare *square = texgrid;
   int x, y;
 
-  glColor3f(1.0,1.0,1.0);
+  glColor4f(1.0,1.0,1.0,1.0);
 
   if (is_yuv)
     glEnableYUVConversion(GL_TEXTURE_2D, use_yuv);