diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-08 19:14:38 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-08 19:14:38 +0000 |
commit | 5999c5b620236fb6a996cf56759aec31f01c126b (patch) | |
tree | 393189b44ba4734119159d7a172c4f77eb0097c6 /src/mesa/main/texcompress.h | |
parent | c93c18abf1950e1494f11166e3f52973efbd6b75 (diff) |
Fix a number of texture compression issues.
Pass the MESA_FORMAT_* token to the _mesa_compressed_row_stride(),
_mesa_compressed_texture_size() and _mesa_compressed_image_address()
functions since we want to use the driver-chosen format, not the user's
internalFormat hint.
Consolidate code related to choosing the texture format in texstoree.c
Diffstat (limited to 'src/mesa/main/texcompress.h')
-rw-r--r-- | src/mesa/main/texcompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h index 5007414546..637c6a80c3 100644 --- a/src/mesa/main/texcompress.h +++ b/src/mesa/main/texcompress.h @@ -34,15 +34,15 @@ _mesa_get_compressed_formats( GLcontext *ctx, GLint *formats ); extern GLuint _mesa_compressed_texture_size( GLcontext *ctx, GLsizei width, GLsizei height, GLsizei depth, - GLenum format ); + GLuint mesaFormat ); extern GLint -_mesa_compressed_row_stride(GLenum format, GLsizei width); +_mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width); extern GLubyte * _mesa_compressed_image_address(GLint col, GLint row, GLint img, - GLenum format, + GLuint mesaFormat, GLsizei width, const GLubyte *image); |