mesa: Change "BRIAN PAUL" to "THE AUTHORS" in license text.

[mesa.git] / src / mesa / main / texcompress.h

diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 53571673f00db165253acf90f245ef2c99893c5e..9869951e9a9ade858f98efeee2dc8c4dfc82bcb2 100644 (file)
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -1,10 +1,8 @@
-/* $Id: texcompress.h,v 1.1 2002/09/27 02:45:38 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +17,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
@@ -27,32 +25,43 @@
 #ifndef TEXCOMPRESS_H
 #define TEXCOMPRESS_H
 
-#include "mtypes.h"
+#include "formats.h"
+#include "glheader.h"
 
+struct gl_context;
 
-extern GLuint
-_mesa_get_compressed_formats( GLcontext *ctx, GLint *formats );
+extern GLenum
+_mesa_gl_compressed_format_base_format(GLenum format);
 
 extern GLuint
-_mesa_compressed_texture_size( GLcontext *ctx,
-                               GLsizei width, GLsizei height, GLsizei depth,
-                               GLenum format );
+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats);
 
-extern GLint
-_mesa_compressed_row_stride(GLenum format, GLsizei width);
+extern gl_format
+_mesa_glenum_to_compressed_format(GLenum format);
 
+extern GLenum
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat);
 
 extern GLubyte *
 _mesa_compressed_image_address(GLint col, GLint row, GLint img,
-                               GLenum format,
+                               gl_format mesaFormat,
                                GLsizei width, const GLubyte *image);
 
 
-extern void
-_mesa_compress_teximage( GLcontext *ctx, GLsizei width, GLsizei height,
-                         GLenum srcFormat,
-                         const GLchan *source, GLint srcRowStride,
-                         GLenum dstformat, GLubyte *dest, GLint dstRowStride );
+/** A function to fetch one texel from a compressed texture */
+typedef void (*compressed_fetch_func)(const GLubyte *map,
+                                      const GLuint imageOffsets[],
+                                      GLint rowStride,
+                                      GLint i, GLint j, GLint k,
+                                      GLfloat *texel);
 
+extern compressed_fetch_func
+_mesa_get_compressed_fetch_func(gl_format format);
+
+
+extern void
+_mesa_decompress_image(gl_format format, GLuint width, GLuint height,
+                       const GLubyte *src, GLint srcRowStride,
+                       GLfloat *dest);
 
 #endif /* TEXCOMPRESS_H */