[MPlayer-cvslog] CVS: main/libvo gl_common.c, 1.16, 1.17 gl_common.h, 1.13, 1.14 vo_gl.c, 1.90, 1.91 vo_gl2.c, 1.74, 1.75

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv15437/libvo

Modified Files:
	gl_common.c gl_common.h vo_gl.c vo_gl2.c 
Log Message:
Fix texture format variable types. Internal format is GLint, others are GLenum


Index: gl_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gl_common.c	19 Aug 2005 12:09:44 -0000	1.16
+++ gl_common.c	25 Aug 2005 12:45:57 -0000	1.17
@@ -110,13 +110,14 @@
  * \param gl_type [OUT] OpenGL type for this image format.
  * \return 1 if format is supported by OpenGL, 0 if not.
  */
-int glFindFormat(uint32_t fmt, uint32_t *bpp, GLenum *gl_texfmt,
+int glFindFormat(uint32_t fmt, uint32_t *bpp, GLint *gl_texfmt,
                   GLenum *gl_format, GLenum *gl_type)
 {
   int dummy1;
   GLenum dummy2;
+  GLint dummy3;
   if (bpp == NULL) bpp = &dummy1;
-  if (gl_texfmt == NULL) gl_texfmt = &dummy2;
+  if (gl_texfmt == NULL) gl_texfmt = &dummy3;
   if (gl_format == NULL) gl_format = &dummy2;
   if (gl_type == NULL) gl_type = &dummy2;
   

Index: gl_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gl_common.h	19 Aug 2005 12:09:44 -0000	1.13
+++ gl_common.h	25 Aug 2005 12:45:57 -0000	1.14
@@ -61,7 +61,7 @@
 
 const char *glValName(GLint value);
 
-int glFindFormat(uint32_t format, uint32_t *bpp, GLenum *gl_texfmt,
+int glFindFormat(uint32_t format, uint32_t *bpp, GLint *gl_texfmt,
                   GLenum *gl_format, GLenum *gl_type);
 int glFmt2bpp(GLenum format, GLenum type);
 void glCreateClearTex(GLenum target, GLenum fmt, GLint filter,

Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- vo_gl.c	21 Aug 2005 09:59:45 -0000	1.90
+++ vo_gl.c	25 Aug 2005 12:45:57 -0000	1.91
@@ -64,7 +64,7 @@
 static int use_glFinish;
 static int swap_interval;
 static GLenum gl_target;
-static GLenum gl_texfmt;
+static GLint gl_texfmt;
 static GLenum gl_format;
 static GLenum gl_type;
 static GLint gl_buffer;

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vo_gl2.c	21 Aug 2005 09:59:45 -0000	1.74
+++ vo_gl2.c	25 Aug 2005 12:45:57 -0000	1.75
@@ -64,8 +64,8 @@
 static struct TexSquare * texgrid = NULL;
 static GLint    gl_internal_format;
 static int      rgb_sz, r_sz, g_sz, b_sz, a_sz;
-static GLint    gl_bitmap_format;
-static GLint    gl_bitmap_type;
+static GLenum   gl_bitmap_format;
+static GLenum   gl_bitmap_type;
 static int      isGL12 = GL_FALSE;
 
 static int      gl_bilinear=1;