Merge branch 'mesa_7_7_branch'

Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c

13 files changed, 27 insertions, 17 deletions

diff --git a/progs/tests/bug_texstore_i8.c b/progs/tests/bug_texstore_i8.c
index 10e5eba7c5..b070011bd2 100644
--- a/progs/tests/bug_texstore_i8.c
+++ b/progs/tests/bug_texstore_i8.c
@@ -73,7 +73,7 @@ static void Init(void)
 			0,
 			sourceFormat,
 			GL_UNSIGNED_BYTE,
-			//GL_UNSIGNED_INT,
+			/* GL_UNSIGNED_INT, */
 			tex2d);
 
 		glEnable(Target);
diff --git a/progs/tests/crossbar.c b/progs/tests/crossbar.c
index bd8e05aee1..2988e20920 100644
--- a/progs/tests/crossbar.c
+++ b/progs/tests/crossbar.c
@@ -174,7 +174,7 @@ static void Init( void )
       exit(1);
    }
 
-   printf("\nAll %u squares should be the same color.\n", NUM_TESTS + 1);
+   printf("\nAll %lu squares should be the same color.\n", (unsigned long) NUM_TESTS + 1);
    
    (void) memset( temp, 0x00, sizeof( temp ) );
    glBindTexture( GL_TEXTURE_2D, 1 );
diff --git a/progs/tests/cva.c b/progs/tests/cva.c
index 80483900cb..02d1dcba2e 100644
--- a/progs/tests/cva.c
+++ b/progs/tests/cva.c
@@ -39,7 +39,7 @@ GLboolean compiled = GL_TRUE;
 GLboolean doubleBuffer = GL_TRUE;
 
 
-void init( void )
+static void init( void )
 {
    glClearColor( 0.0, 0.0, 0.0, 0.0 );
    glShadeModel( GL_SMOOTH );
@@ -69,7 +69,7 @@ void init( void )
 #endif
 }
 
-void display( void )
+static void display( void )
 {
    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 
@@ -81,7 +81,7 @@ void display( void )
    }
 }
 
-void keyboard( unsigned char key, int x, int y )
+static void keyboard( unsigned char key, int x, int y )
 {
    switch ( key ) {
       case 27:
@@ -92,7 +92,7 @@ void keyboard( unsigned char key, int x, int y )
    glutPostRedisplay();
 }
 
-GLboolean args( int argc, char **argv )
+static GLboolean args( int argc, char **argv )
 {
     GLint i;
 
diff --git a/progs/tests/fptest1.c b/progs/tests/fptest1.c
index 2b8f8d0f5e..1f30d5733e 100644
--- a/progs/tests/fptest1.c
+++ b/progs/tests/fptest1.c
@@ -57,6 +57,7 @@ static void Key( unsigned char key, int x, int y )
 
 static void Init( void )
 {
+#if 0
    static const char *prog0 =
       "!!FP1.0\n"
       "MUL   o[COLR], R0, f[WPOS]; \n"
@@ -73,6 +74,7 @@ static void Init( void )
       "MOV   HC, H2; \n"
       "END \n"
       ;
+#endif
 
    /* masked updates, defines, declarations */
    static const char *prog1 =
diff --git a/progs/tests/invert.c b/progs/tests/invert.c
index 3bc97a460b..45001b44d0 100644
--- a/progs/tests/invert.c
+++ b/progs/tests/invert.c
@@ -165,7 +165,7 @@ static void Init( void )
 	  "square should look upside-down.\n");
    
 
-   image = LoadRGBImage( IMAGE_FILE, & img_width, & img_height,
+   image = LoadRGBImage( IMAGE_FILE, (GLint *) & img_width, (GLint *) & img_height,
 			 & img_format );
    if ( image == NULL ) {
       printf( "Could not open image file \"%s\".\n", IMAGE_FILE );
diff --git a/progs/tests/packedpixels.c b/progs/tests/packedpixels.c
index c8884bb79f..1e70a31151 100644
--- a/progs/tests/packedpixels.c
+++ b/progs/tests/packedpixels.c
@@ -274,6 +274,7 @@ Draw(void)
    glRasterPos2i(8, 6);
    sprintf(s, "Internal Texture Format [f/F]: %s (%d of %lu)",
            IntFormats[CurFormat].name, CurFormat + 1, NUM_INT_FORMATS);
+           IntFormats[CurFormat].name, CurFormat + 1, (unsigned long) NUM_INT_FORMATS);
    PrintString(s);
    glPopMatrix();
 
diff --git a/progs/tests/quads.c b/progs/tests/quads.c
index 2098b51ccd..e5b9920b66 100644
--- a/progs/tests/quads.c
+++ b/progs/tests/quads.c
@@ -17,7 +17,10 @@ static GLfloat Xrot = 40, Yrot = 0, Zrot = 0;
 static GLboolean Anim = GL_TRUE;
 static GLuint Vbuffer = 0;
 
+#if 1
+#else
 static GLfloat buf[NUM_QUADS * 6 * 4];
+#endif
 
 static GLboolean doSwapBuffers = GL_TRUE;
 
diff --git a/progs/tests/scissor-viewport.c b/progs/tests/scissor-viewport.c
index 582e65fb72..4ef307b424 100644
--- a/progs/tests/scissor-viewport.c
+++ b/progs/tests/scissor-viewport.c
@@ -104,7 +104,7 @@ static void draw(void)
 
    glDisable(GL_SCISSOR_TEST);
 
-   //glutSwapBuffers();
+   /* glutSwapBuffers(); */
    glFlush();
 }
 
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
    glutInitWindowPosition(100, 0);
    glutInitWindowSize(prog.width, prog.height);
 
-   //type = GLUT_RGB | GLUT_DOUBLE;
+   /* type = GLUT_RGB | GLUT_DOUBLE; */
    type = GLUT_RGB | GLUT_SINGLE;
    glutInitDisplayMode(type);
 
diff --git a/progs/tests/scissor.c b/progs/tests/scissor.c
index 2dfd2174e8..e5a68ffabd 100644
--- a/progs/tests/scissor.c
+++ b/progs/tests/scissor.c
@@ -134,7 +134,7 @@ static void draw(void)
 
    glDisable(GL_SCISSOR_TEST);
 
-   //glutSwapBuffers();
+   /* glutSwapBuffers(); */
    glFlush();
 }
 
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
    glutInitWindowPosition(100, 0);
    glutInitWindowSize(prog.width, prog.height);
 
-   //type = GLUT_RGB | GLUT_DOUBLE;
+   /* type = GLUT_RGB | GLUT_DOUBLE; */
    type = GLUT_RGB | GLUT_SINGLE;
    glutInitDisplayMode(type);
 
diff --git a/progs/tests/stencilwrap.c b/progs/tests/stencilwrap.c
index 2e219fd8b5..d396fc2a53 100644
--- a/progs/tests/stencilwrap.c
+++ b/progs/tests/stencilwrap.c
@@ -257,7 +257,7 @@ static void Init( void )
     * part of GL 1.4.
     */
 
-   ver_str = glGetString( GL_VERSION );
+   ver_str = (char *) glGetString( GL_VERSION );
    version = (ver_str == NULL) ? 1.0 : atof( ver_str );
 
    wrapping = (glutExtensionSupported("GL_EXT_stencil_wrap") || (version >= 1.4));
diff --git a/progs/tests/tex1d.c b/progs/tests/tex1d.c
index 4abe1068c7..7d67451c0d 100644
--- a/progs/tests/tex1d.c
+++ b/progs/tests/tex1d.c
@@ -39,11 +39,13 @@ static void draw( void )
 
 
 
+/*
 static void idle( void )
 {
    Angle += 2.0;
    glutPostRedisplay();
 }
+*/
 
 
 
diff --git a/progs/tests/unfilledclip.c b/progs/tests/unfilledclip.c
index db6fffa3e8..331cbf2f6b 100644
--- a/progs/tests/unfilledclip.c
+++ b/progs/tests/unfilledclip.c
@@ -31,6 +31,7 @@
 
 static int win_width, win_height;
 
+#if 0
 static void
 line(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
@@ -39,6 +40,7 @@ line(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 	glVertex2f(x2, y2);
 	glEnd();
 }
+#endif
 
 static void
 line3(GLfloat x1, GLfloat y1, GLfloat z1, GLfloat x2, GLfloat y2, GLfloat z2)
diff --git a/progs/tests/vpeval.c b/progs/tests/vpeval.c
index f07737f973..3e8a732df5 100644
--- a/progs/tests/vpeval.c
+++ b/progs/tests/vpeval.c
@@ -94,16 +94,16 @@ GLfloat colorPoints[4][4][4] =
 };
 
 
-void
+static void
 initlights(void)
 {
+#if 0 /* no lighting for now */
     GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
     GLfloat position[] = {0.0, 0.0, 2.0, 1.0};
     GLfloat mat_diffuse[] = {0.6, 0.6, 0.6, 1.0};
     GLfloat mat_specular[] = {1.0, 1.0, 1.0, 1.0};
     GLfloat mat_shininess[] = {50.0};
 
-#if 0 /* no lighting for now */
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);
 
@@ -116,7 +116,7 @@ initlights(void)
 #endif
 }
 
-void
+static void
 display(void)
 {
    glClearColor(.3, .3, .3, 0);
@@ -130,7 +130,7 @@ display(void)
     glFlush();
 }
 
-void
+static void
 myinit(int argc, char *argv[])
 {
     glClearColor(0.0, 0.0, 0.0, 1.0);
@@ -186,7 +186,7 @@ myinit(int argc, char *argv[])
     }
 }
 
-void
+static void
 myReshape(int w, int h)
 {
     glViewport(0, 0, w, h);