added GL_SGIX/SGIS_pixel_texture

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

diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 252363c8da2f274222fadd043528e55c23100298..500fa7e3eb70d8af3c1e361c60e2a919878638a0 100644 (file)
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -1,4 +1,4 @@
-/* $Id: image.h,v 1.4 2000/03/13 18:31:51 brianp Exp $ */
+/* $Id: image.h,v 1.7 2000/03/21 16:09:38 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,33 +32,41 @@
 #include "types.h"
 
 
-extern struct gl_pixelstore_attrib _mesa_native_packing;
+extern const struct gl_pixelstore_attrib _mesa_native_packing;
 
 
-extern void gl_flip_bytes( GLubyte *p, GLuint n );
-
+extern void
+_mesa_swap2( GLushort *p, GLuint n );
 
-extern void gl_swap2( GLushort *p, GLuint n );
+extern void
+_mesa_swap4( GLuint *p, GLuint n );
 
-extern void gl_swap4( GLuint *p, GLuint n );
+extern GLint
+_mesa_sizeof_type( GLenum type );
 
+extern GLint
+_mesa_sizeof_packed_type( GLenum type );
 
-extern GLint gl_sizeof_type( GLenum type );
+extern GLint
+_mesa_components_in_format( GLenum format );
 
-extern GLint gl_sizeof_packed_type( GLenum type );
+extern GLint
+_mesa_bytes_per_pixel( GLenum format, GLenum type );
 
-extern GLint gl_components_in_format( GLenum format );
+extern GLboolean
+_mesa_is_legal_format_and_type( GLenum format, GLenum type );
 
-extern GLint gl_bytes_per_pixel( GLenum format, GLenum type );
 
-extern GLboolean gl_is_legal_format_and_type( GLenum format, GLenum type );
+extern GLvoid *
+_mesa_image_address( const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column );
 
 
-extern GLvoid *
-gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing,
-                        const GLvoid *image, GLsizei width,
-                        GLsizei height, GLenum format, GLenum type,
-                        GLint img, GLint row, GLint column );
+extern GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type );
 
 
 extern void
@@ -72,11 +80,11 @@ _mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
 
 
 extern void
-gl_pack_rgba_span( const GLcontext *ctx,
-                   GLuint n, CONST GLubyte rgba[][4],
-                   GLenum format, GLenum type, GLvoid *dest,
-                   const struct gl_pixelstore_attrib *packing,
-                   GLboolean applyTransferOps );
+_mesa_pack_rgba_span( const GLcontext *ctx,
+                      GLuint n, CONST GLubyte rgba[][4],
+                      GLenum format, GLenum type, GLvoid *dest,
+                      const struct gl_pixelstore_attrib *packing,
+                      GLboolean applyTransferOps );
 
 
 extern void