Mercurial > mplayer.hg
changeset 16303:a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
| author | reimar |
|---|---|
| date | Thu, 25 Aug 2005 12:45:57 +0000 |
| parents | 36a018da4c27 |
| children | d3ccd767b10d |
| files | libvo/gl_common.c libvo/gl_common.h libvo/vo_gl.c libvo/vo_gl2.c |
| diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/gl_common.c Wed Aug 24 12:33:32 2005 +0000 +++ b/libvo/gl_common.c Thu Aug 25 12:45:57 2005 +0000 @@ -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;
--- a/libvo/gl_common.h Wed Aug 24 12:33:32 2005 +0000 +++ b/libvo/gl_common.h Thu Aug 25 12:45:57 2005 +0000 @@ -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,
--- a/libvo/vo_gl.c Wed Aug 24 12:33:32 2005 +0000 +++ b/libvo/vo_gl.c Thu Aug 25 12:45:57 2005 +0000 @@ -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;
--- a/libvo/vo_gl2.c Wed Aug 24 12:33:32 2005 +0000 +++ b/libvo/vo_gl2.c Thu Aug 25 12:45:57 2005 +0000 @@ -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;