Mercurial > mplayer.hg

changeset 34061:fe03e0d5c7d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove usage of glColor3f, there is not really a point in it.
author reimar
date Wed, 28 Sep 2011 18:52:11 +0000
parents fab4513840cb
children 4a0cac2ced3f
files libvo/gl_common.c libvo/gl_common.h libvo/vo_gl.c libvo/vo_gl2.c
diffstat 4 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Wed Sep 28 18:26:18 2011 +0000
+++ b/libvo/gl_common.c	Wed Sep 28 18:52:11 2011 +0000
@@ -65,7 +65,6 @@
 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 @@
   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),
--- a/libvo/gl_common.h	Wed Sep 28 18:26:18 2011 +0000
+++ b/libvo/gl_common.h	Wed Sep 28 18:52:11 2011 +0000
@@ -461,7 +461,6 @@
 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);
--- a/libvo/vo_gl.c	Wed Sep 28 18:26:18 2011 +0000
+++ b/libvo/vo_gl.c	Wed Sep 28 18:52:11 2011 +0000
@@ -820,7 +820,7 @@
 //  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) {
--- a/libvo/vo_gl2.c	Wed Sep 28 18:26:18 2011 +0000
+++ b/libvo/vo_gl2.c	Wed Sep 28 18:52:11 2011 +0000
@@ -382,7 +382,7 @@
   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);