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

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

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 9a1734bf4be491e016baed4ce9c7c1b46a759751..a44f9a01c54b461559f423170e1004bea0dfa159 100644 (file)
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -155,7 +155,7 @@ set_component_sizes( struct gl_color_table *table )
 
 
 
-void
+void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalFormat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *data )
@@ -439,7 +439,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
 
 
 
-void
+void GLAPIENTRY
 _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,
                      const GLvoid *data )
@@ -637,7 +637,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
 
 
 /* XXX not tested */
-void
+void GLAPIENTRY
 _mesa_CopyColorTable(GLenum target, GLenum internalformat,
                      GLint x, GLint y, GLsizei width)
 {
@@ -651,7 +651,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat,
 
 
 /* XXX not tested */
-void
+void GLAPIENTRY
 _mesa_CopyColorSubTable(GLenum target, GLsizei start,
                         GLint x, GLint y, GLsizei width)
 {
@@ -663,7 +663,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start,
 
 
 
-void
+void GLAPIENTRY
 _mesa_GetColorTable( GLenum target, GLenum format,
                      GLenum type, GLvoid *data )
 {
@@ -864,7 +864,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
 
 
 
-void
+void GLAPIENTRY
 _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -957,7 +957,7 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 
 
 
-void
+void GLAPIENTRY
 _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
    GLfloat fparams[4];
@@ -980,7 +980,7 @@ _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 
 
 
-void
+void GLAPIENTRY
 _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1154,7 +1154,7 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
 
 
 
-void
+void GLAPIENTRY
 _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1332,7 +1332,7 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
 
 
 void
-_mesa_init_one_colortable( struct gl_color_table *p )
+_mesa_init_colortable( struct gl_color_table *p )
 {
    p->FloatTable = GL_FALSE;
    p->Table = NULL;
@@ -1343,7 +1343,7 @@ _mesa_init_one_colortable( struct gl_color_table *p )
 
 
 void
-_mesa_free_one_colortable( struct gl_color_table *p )
+_mesa_free_colortable_data( struct gl_color_table *p )
 {
    if (p->Table) {
       FREE(p->Table);
@@ -1351,23 +1351,31 @@ _mesa_free_one_colortable( struct gl_color_table *p )
    }
 }
 
-void _mesa_init_colortable( GLcontext * ctx )
+
+/*
+ * Initialize all colortables for a context.
+ */
+void _mesa_init_colortables( GLcontext * ctx )
 {
    /* Color tables */
-   _mesa_init_one_colortable(&ctx->ColorTable);
-   _mesa_init_one_colortable(&ctx->ProxyColorTable);
-   _mesa_init_one_colortable(&ctx->PostConvolutionColorTable);
-   _mesa_init_one_colortable(&ctx->ProxyPostConvolutionColorTable);
-   _mesa_init_one_colortable(&ctx->PostColorMatrixColorTable);
-   _mesa_init_one_colortable(&ctx->ProxyPostColorMatrixColorTable);
+   _mesa_init_colortable(&ctx->ColorTable);
+   _mesa_init_colortable(&ctx->ProxyColorTable);
+   _mesa_init_colortable(&ctx->PostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->PostColorMatrixColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostColorMatrixColorTable);
 }
 
-void _mesa_free_colortable_data( GLcontext *ctx )
+
+/*
+ * Free all colortable data for a context
+ */
+void _mesa_free_colortables_data( GLcontext *ctx )
 {
-   _mesa_free_one_colortable( &ctx->ColorTable );
-   _mesa_free_one_colortable( &ctx->ProxyColorTable );
-   _mesa_free_one_colortable( &ctx->PostConvolutionColorTable );
-   _mesa_free_one_colortable( &ctx->ProxyPostConvolutionColorTable );
-   _mesa_free_one_colortable( &ctx->PostColorMatrixColorTable );
-   _mesa_free_one_colortable( &ctx->ProxyPostColorMatrixColorTable );
+   _mesa_free_colortable_data(&ctx->ColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyColorTable);
+   _mesa_free_colortable_data(&ctx->PostConvolutionColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyPostConvolutionColorTable);
+   _mesa_free_colortable_data(&ctx->PostColorMatrixColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyPostColorMatrixColorTable);
 }