more work on GL_SGI_color_table, pixel transfer code clean-up

1 files changed, 28 insertions, 41 deletions

diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index b40af4929f..27d200825e 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -1,10 +1,10 @@
-/* $Id: pixel.h,v 1.4 2000/04/08 18:57:45 brianp Exp $ */
+/* $Id: pixel.h,v 1.5 2000/04/12 18:54:48 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  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"),
@@ -76,69 +76,56 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
  * Pixel processing functions
  */
 
-extern void gl_scale_and_bias_color( const GLcontext *ctx, GLuint n,
-                                     GLfloat red[], GLfloat green[],
-                                     GLfloat blue[], GLfloat alpha[] );
-
-
-extern void gl_scale_and_bias_rgba( const GLcontext *ctx, GLuint n,
-                                    GLubyte rgba[][4] );
-
-
 extern void
-_mesa_scale_and_bias_rgba_float( const GLcontext *ctx, GLuint n,
-                                 GLfloat rgba[][4] );
-
-
-extern void gl_map_rgba( const GLcontext *ctx, GLuint n, GLubyte rgba[][4] );
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
 extern void
-_mesa_map_rgba_float( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] );
+_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
 extern void
 _mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_map_color( const GLcontext *ctx, GLuint n,
-                          GLfloat red[], GLfloat green[],
-                          GLfloat blue[], GLfloat alpha[] );
-
-
-extern void gl_shift_and_offset_ci( const GLcontext *ctx, GLuint n,
-                                    GLuint indexes[] );
+extern void
+_mesa_lookup_rgba(const struct gl_color_table *table,
+                  GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_map_ci( const GLcontext *ctx, GLuint n, GLuint index[] );
+extern void
+_mesa_shift_and_offset_ci(const GLcontext *ctx, GLuint n,
+                          GLuint indexes[]);
 
 
-extern void gl_map_ci_to_rgba( const GLcontext *ctx,
-                               GLuint n, const GLuint index[],
-                               GLubyte rgba[][4] );
+extern void
+_mesa_map_ci(const GLcontext *ctx, GLuint n, GLuint index[]);
 
 
-extern void gl_map_ci_to_rgba_float( const GLcontext *ctx,
-                                     GLuint n, const GLuint index[],
-                                     GLfloat rgba[][4] );
+extern void
+_mesa_map_ci_to_rgba_ubyte(const GLcontext *ctx,
+                           GLuint n, const GLuint index[],
+                           GLubyte rgba[][4]);
 
 
-extern void gl_map_ci8_to_rgba( const GLcontext *ctx,
-                                GLuint n, const GLubyte index[],
-                                GLubyte rgba[][4] );
+extern void
+_mesa_map_ci_to_rgba(const GLcontext *ctx,
+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
 
 
-extern void gl_map_ci_to_color( const GLcontext *ctx,
-                                GLuint n, const GLuint index[],
-                                GLfloat r[], GLfloat g[],
-                                GLfloat b[], GLfloat a[] );
+extern void
+_mesa_map_ci8_to_rgba(const GLcontext *ctx,
+                      GLuint n, const GLubyte index[],
+                      GLubyte rgba[][4]);
 
 
-extern void gl_shift_and_offset_stencil( const GLcontext *ctx, GLuint n,
-                                         GLstencil indexes[] );
+extern void
+_mesa_shift_and_offset_stencil(const GLcontext *ctx, GLuint n,
+                               GLstencil indexes[]);
 
 
-extern void gl_map_stencil( const GLcontext *ctx, GLuint n, GLstencil index[] );
+extern void
+_mesa_map_stencil(const GLcontext *ctx, GLuint n, GLstencil index[]);
 
 
 #endif