Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

3 files changed, 7 insertions, 3 deletions

diff --git a/progs/tests/fbotest1.c b/progs/tests/fbotest1.c
index 8dac21494e..0cd7f95c35 100644
--- a/progs/tests/fbotest1.c
+++ b/progs/tests/fbotest1.c
@@ -127,7 +127,7 @@ Init( void )
 
    if (!glutExtensionSupported("GL_EXT_framebuffer_object")) {
       printf("GL_EXT_framebuffer_object not found!\n");
-      /*exit(0);*/
+      exit(0);
    }
    printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
 
diff --git a/progs/tests/texcmp.c b/progs/tests/texcmp.c
index 52c504a318..d1e829d1b7 100644
--- a/progs/tests/texcmp.c
+++ b/progs/tests/texcmp.c
@@ -371,11 +371,11 @@ int main( int argc, char *argv[] )
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
 
    if (glutCreateWindow(argv[0]) <= 0) {
-      glewInit();
       printf("Couldn't create window\n");
       exit(0);
    }
 
+   glewInit();
    gl_version = atof( (const char *) glGetString( GL_VERSION ) );
    if ( (gl_version < 1.3) 
 	&& !glutExtensionSupported("GL_ARB_texture_compression") ) {
diff --git a/progs/tests/zreaddraw.c b/progs/tests/zreaddraw.c
index 2cbfeb6ff1..8839e10836 100644
--- a/progs/tests/zreaddraw.c
+++ b/progs/tests/zreaddraw.c
@@ -24,6 +24,8 @@ static void Display(void)
    glClearColor(0.5, 0.5, 0.5, 1.0);
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+   glEnable(GL_DEPTH_TEST);
+
    /* draw a sphere */
    glViewport(0, 0, 100, 100);
    glMatrixMode(GL_PROJECTION);
@@ -46,9 +48,12 @@ static void Display(void)
 
    /* draw depth image with scaling (into z buffer) */
    glPixelZoom(4.0, 4.0);
+   glColor4f(1, 0, 0, 0);
    glWindowPos2i(100, 0);
    glDrawPixels(100, 100, GL_DEPTH_COMPONENT, GL_FLOAT, depth);
 
+   glDisable(GL_DEPTH_TEST);
+
    /* read back scaled depth image */
    glReadPixels(100, 0, 400, 400, GL_DEPTH_COMPONENT, GL_FLOAT, depth2);
    /* draw as luminance */
@@ -96,7 +101,6 @@ static void Init(void)
    glLightfv(GL_LIGHT0, GL_POSITION, pos);
    glEnable(GL_LIGHTING);
    glEnable(GL_LIGHT0);
-   glEnable(GL_DEPTH_TEST);
 }