init secondary color to (0,0,0,1). remove some redundant initializations.

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

diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index 6d3a4397b2da78a7b29a097ae3b576f282c4a87f..72da2a08f968f83cd2c6bab44442921d7ff42fda 100644 (file)
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -1,3 +1,10 @@
+/**
+ * \file texstore.h
+ * Texture image storage.
+ *
+ * \author Brian Paul
+ */
+
 /*
  * Mesa 3-D graphics library
  * Version:  5.1
@@ -22,11 +29,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Authors:
- *   Brian Paul
- */
-
 
 #ifndef TEXSTORE_H
 #define TEXSTORE_H
@@ -62,7 +64,7 @@ extern void
 _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint border,
-                       GLenum format, GLenum type, const void *pixels,
+                       GLenum format, GLenum type, const GLvoid *pixels,
                        const struct gl_pixelstore_attrib *packing,
                        struct gl_texture_object *texObj,
                        struct gl_texture_image *texImage);
@@ -72,7 +74,7 @@ extern void
 _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint depth, GLint border,
-                       GLenum format, GLenum type, const void *pixels,
+                       GLenum format, GLenum type, const GLvoid *pixels,
                        const struct gl_pixelstore_attrib *packing,
                        struct gl_texture_object *texObj,
                        struct gl_texture_image *texImage);
@@ -81,7 +83,7 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
 extern void
 _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint width,
-                          GLenum format, GLenum type, const void *pixels,
+                          GLenum format, GLenum type, const GLvoid *pixels,
                           const struct gl_pixelstore_attrib *packing,
                           struct gl_texture_object *texObj,
                           struct gl_texture_image *texImage);
@@ -91,7 +93,7 @@ extern void
 _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLint width, GLint height,
-                          GLenum format, GLenum type, const void *pixels,
+                          GLenum format, GLenum type, const GLvoid *pixels,
                           const struct gl_pixelstore_attrib *packing,
                           struct gl_texture_object *texObj,
                           struct gl_texture_image *texImage);
@@ -101,7 +103,7 @@ extern void
 _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset, GLint zoffset,
                           GLint width, GLint height, GLint depth,
-                          GLenum format, GLenum type, const void *pixels,
+                          GLenum format, GLenum type, const GLvoid *pixels,
                           const struct gl_pixelstore_attrib *packing,
                           struct gl_texture_object *texObj,
                           struct gl_texture_image *texImage);