summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-24 11:41:25 -0600
committerBrian Paul <brianp@vmware.com>2009-10-24 11:41:25 -0600
commit1ad9671db7bd60fa84266f30f46555b4e45bcb08 (patch)
tree78d45add5e42855e0686f2b620c50a91d6c681ea
parent2c3787f5130f79c3adbb9e8e1ace8935c919876f (diff)
mesa: s/GLuint/gl_format/
-rw-r--r--src/mesa/main/texcompress.c6
-rw-r--r--src/mesa/main/texcompress.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 5713b2c00d8..76f2f232f43 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -131,7 +131,7 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
GLuint
_mesa_compressed_texture_size( GLcontext *ctx,
GLsizei width, GLsizei height, GLsizei depth,
- GLuint mesaFormat )
+ gl_format mesaFormat )
{
return _mesa_format_image_size(mesaFormat, width, height, depth);
}
@@ -210,7 +210,7 @@ _mesa_compressed_texture_size_glenum(GLcontext *ctx,
* \return stride, in bytes, between rows for compressed image
*/
GLint
-_mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width)
+_mesa_compressed_row_stride(gl_format mesaFormat, GLsizei width)
{
GLint stride;
@@ -261,7 +261,7 @@ _mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width)
*/
GLubyte *
_mesa_compressed_image_address(GLint col, GLint row, GLint img,
- GLuint mesaFormat,
+ gl_format mesaFormat,
GLsizei width, const GLubyte *image)
{
GLubyte *addr;
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 44f33382228..13af1483942 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -26,6 +26,7 @@
#define TEXCOMPRESS_H
#include "mtypes.h"
+#include "formats.h"
#if _HAVE_FULL_GL
@@ -35,7 +36,7 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all);
extern GLuint
_mesa_compressed_texture_size( GLcontext *ctx,
GLsizei width, GLsizei height, GLsizei depth,
- GLuint mesaFormat );
+ gl_format mesaFormat );
extern GLuint
_mesa_compressed_texture_size_glenum(GLcontext *ctx,
@@ -43,12 +44,12 @@ _mesa_compressed_texture_size_glenum(GLcontext *ctx,
GLsizei depth, GLenum glformat);
extern GLint
-_mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width);
+_mesa_compressed_row_stride(gl_format mesaFormat, GLsizei width);
extern GLubyte *
_mesa_compressed_image_address(GLint col, GLint row, GLint img,
- GLuint mesaFormat,
+ gl_format mesaFormat,
GLsizei width, const GLubyte *image);