replace color table FloatTable boolean with Type enum

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

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a8f0edba8b6de37b8f6b32a0b56aebccfd1f9ffc..18e1563102194e8ccb793b492299e7e9fe5439ed 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -252,8 +252,8 @@ struct gl_color_table {
    GLenum Format;         /**< GL_ALPHA, GL_RGB, GL_RGB, etc */
    GLenum IntFormat;
    GLuint Size;           /**< number of entries (rows) in table */
-   GLvoid *Table;         /**< either GLfloat * or GLchan * */
-   GLboolean FloatTable;  /**< are entries stored as floats? */
+   GLvoid *Table;         /**< points to data of <Type> */
+   GLenum Type;           /**< GL_UNSIGNED_BYTE or GL_FLOAT */
    GLubyte RedSize;
    GLubyte GreenSize;
    GLubyte BlueSize;
@@ -1571,6 +1571,7 @@ struct fragment_program
    GLuint NumAluInstructions; /**< GL_ARB_fragment_program */
    GLuint NumTexInstructions;
    GLuint NumTexIndirections;
+   GLenum FogOption;
    struct program_parameter_list *Parameters; /**< array [NumParameters] */
 };
 
@@ -2105,7 +2106,7 @@ struct gl_tnl_module {
    /**
     * Vertex format to be lazily swapped into current dispatch.
     */
-   GLvertexformat *Current;
+   const GLvertexformat *Current;
 
    /**
     * \name Record of functions swapped out.