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

[mesa.git] / src / mesa / main / drawpix.c

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 83196d3de01e30976097f017ab29a5b70ce5b042..12b9f2930d898dbfdc75ddd13cc841ac67f51e5a 100644 (file)
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -38,7 +38,7 @@
 /*
  * Execute glDrawPixels
  */
-void
+void GLAPIENTRY
 _mesa_DrawPixels( GLsizei width, GLsizei height,
                   GLenum format, GLenum type, const GLvoid *pixels )
 {
@@ -87,7 +87,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
    }
 }
 
-void
+void GLAPIENTRY
 _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
                   GLenum type )
 {
@@ -139,7 +139,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
 
 
 
-void
+void GLAPIENTRY
 _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
                  GLenum format, GLenum type, GLvoid *pixels )
 {
@@ -168,7 +168,7 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
 
 
 
-void
+void GLAPIENTRY
 _mesa_Bitmap( GLsizei width, GLsizei height,
               GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
               const GLubyte *bitmap )
@@ -211,7 +211,8 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
                                ctx->Current.RasterTexCoords[0] );
       }
    }
-   else if (ctx->RenderMode==GL_SELECT) {
+   else {
+      ASSERT(ctx->RenderMode == GL_SELECT);
       /* Bitmaps don't generate selection hits.  See appendix B of 1.1 spec. */
    }
 #endif
@@ -231,7 +232,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
  * Z-compositing.  Normally, this operation requires two glDrawPixels
  * calls with stencil testing.
  */
-void
+void GLAPIENTRY
 _mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
                            GLenum colorFormat, GLenum colorType,
                            const GLvoid *colors,