Revert "mesa: meaningless whitespace change to see if git's working (ignore)"

This reverts commit b2e779988eeb595187933fe2122d86f8ccfe059c.

I didn't mean to push this stuff yet.  I'm having a bad git day...

2 files changed, 5 insertions, 9 deletions

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 65970a53a94..77fef325583 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -164,7 +164,9 @@ static void add_debug_flags( const char *debug )
       { "api",       VERBOSE_API },
       { "list",      VERBOSE_DISPLAY_LIST },
       { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM }
+      { "disassem",  VERBOSE_DISASSEM },
+      { "glsl",      VERBOSE_GLSL },     /* report GLSL compile/link errors */
+      { "glsl_dump", VERBOSE_GLSL_DUMP } /* print shader GPU instructions */
    };
    GLuint i;
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 509da06d092..17dd3e6afde 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2162,13 +2162,6 @@ struct gl_shader_program
 };   
 
 
-#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */
-#define GLSL_LOG       0x2  /**< Write shaders to files */
-#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */
-#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */
-#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */
-
-
 /**
  * Context state for GLSL vertex/fragment shaders.
  */
@@ -2180,7 +2173,6 @@ struct gl_shader_state
    GLboolean EmitCondCodes;             /**< Use condition codes? */
    GLboolean EmitComments;              /**< Annotated instructions */
    void *MemPool;
-   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
 };
 
 
@@ -3171,6 +3163,8 @@ enum _verbose
    VERBOSE_PRIMS		= 0x0400,
    VERBOSE_VERTS		= 0x0800,
    VERBOSE_DISASSEM		= 0x1000,
+   VERBOSE_GLSL			= 0x2000,
+   VERBOSE_GLSL_DUMP		= 0x4000
 };