Mercurial > mplayer.hg
comparison libvo/gl_common.h @ 16879:6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
author | reimar |
---|---|
date | Mon, 31 Oct 2005 13:56:16 +0000 |
parents | 6b0dc40bf961 |
children | 724353364790 |
comparison
equal
deleted
inserted
replaced
16878:865ba529e6fd | 16879:6ea220b10e8e |
---|---|
182 | 182 |
183 void glAdjustAlignment(int stride); | 183 void glAdjustAlignment(int stride); |
184 | 184 |
185 const char *glValName(GLint value); | 185 const char *glValName(GLint value); |
186 | 186 |
187 int glFindFormat(uint32_t format, uint32_t *bpp, GLint *gl_texfmt, | 187 int glFindFormat(uint32_t format, int *bpp, GLint *gl_texfmt, |
188 GLenum *gl_format, GLenum *gl_type); | 188 GLenum *gl_format, GLenum *gl_type); |
189 int glFmt2bpp(GLenum format, GLenum type); | 189 int glFmt2bpp(GLenum format, GLenum type); |
190 void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, | 190 void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, |
191 int w, int h, unsigned char val); | 191 int w, int h, unsigned char val); |
192 int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, | 192 int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, |
193 FILE *f, int *width, int *height, int *maxval); | 193 FILE *f, int *width, int *height, int *maxval); |
194 void glUploadTex(GLenum target, GLenum format, GLenum type, | 194 void glUploadTex(GLenum target, GLenum format, GLenum type, |
195 const char *data, int stride, | 195 const void *data, int stride, |
196 int x, int y, int w, int h, int slice); | 196 int x, int y, int w, int h, int slice); |
197 void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h, | 197 void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h, |
198 GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th, | 198 GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th, |
199 int sx, int sy, int rect_tex, int is_yv12); | 199 int sx, int sy, int rect_tex, int is_yv12); |
200 | 200 |