RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix texture format variable types. Internal format is GLint, others are GLenum 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-08-25 12:45:57 +00:00
parent a030e2fe1c
commit f68be97419
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libvo/gl_common.c
View File

@ -110,13 +110,14 @@ const char *glValName(GLint value)
* \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;

2
libvo/gl_common.h
View File

@ -61,7 +61,7 @@ void glAdjustAlignment(int stride);
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,

2
libvo/vo_gl.c
View File

@ -64,7 +64,7 @@ static int many_fmts;
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;

4
libvo/vo_gl2.c
View File

@ -64,8 +64,8 @@ static int texnumx, texnumy, raw_line_len;
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;