Mercurial > mplayer.hg
comparison libvo/gl_common.c @ 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 | 5e3e86e8c9b4 |
children | 179a7a2857a8 |
comparison
equal
deleted
inserted
replaced
16878:865ba529e6fd | 16879:6ea220b10e8e |
---|---|
152 * \param gl_format [OUT] OpenGL format for this image format. | 152 * \param gl_format [OUT] OpenGL format for this image format. |
153 * \param gl_type [OUT] OpenGL type for this image format. | 153 * \param gl_type [OUT] OpenGL type for this image format. |
154 * \return 1 if format is supported by OpenGL, 0 if not. | 154 * \return 1 if format is supported by OpenGL, 0 if not. |
155 * \ingroup gltexture | 155 * \ingroup gltexture |
156 */ | 156 */ |
157 int glFindFormat(uint32_t fmt, uint32_t *bpp, GLint *gl_texfmt, | 157 int glFindFormat(uint32_t fmt, int *bpp, GLint *gl_texfmt, |
158 GLenum *gl_format, GLenum *gl_type) | 158 GLenum *gl_format, GLenum *gl_type) |
159 { | 159 { |
160 int supported = 1; | 160 int supported = 1; |
161 int dummy1; | 161 int dummy1; |
162 GLenum dummy2; | 162 GLenum dummy2; |
476 * \param h height of the texture part to upload | 476 * \param h height of the texture part to upload |
477 * \param slice height of an upload slice, 0 for all at once | 477 * \param slice height of an upload slice, 0 for all at once |
478 * \ingroup gltexture | 478 * \ingroup gltexture |
479 */ | 479 */ |
480 void glUploadTex(GLenum target, GLenum format, GLenum type, | 480 void glUploadTex(GLenum target, GLenum format, GLenum type, |
481 const char *data, int stride, | 481 const void *data, int stride, |
482 int x, int y, int w, int h, int slice) { | 482 int x, int y, int w, int h, int slice) { |
483 int y_max = y + h; | 483 int y_max = y + h; |
484 if (w <= 0 || h <= 0) return; | 484 if (w <= 0 || h <= 0) return; |
485 if (slice <= 0) | 485 if (slice <= 0) |
486 slice = h; | 486 slice = h; |