mesa: s/GLuint/gl_format/

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 5713b2c00d8fb005c26ccd6ff9154298b250b622..76f2f232f43980b20f630bfc211e5092b0f3d193 100644 (file)
--- 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 44f33382228961abdcb11126c0b342dc208955a3..13af1483942e3cb778abcbf199a26594cf0f6a26 100644 (file)
--- 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);