Merge commit 'origin/master' into gallium-msaa

2 files changed, 8 insertions, 1 deletions

diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c
index 450861e577..ddfd548b8b 100644
--- a/progs/demos/gloss.c
+++ b/progs/demos/gloss.c
@@ -282,6 +282,13 @@ static void Init( int argc, char *argv[] )
       }
    }
 
+   if (convolve && !glutExtensionSupported("GL_ARB_imaging")) {
+      fprintf(stderr,
+              "GL_ARB_imaging is not supported, disabling convolution.\n");
+      exit(1);
+   }
+
+
    if (fullscreen)
       glutFullScreen();
 
diff --git a/progs/demos/vao_demo.c b/progs/demos/vao_demo.c
index 5ce07ecc63..b81004b067 100644
--- a/progs/demos/vao_demo.c
+++ b/progs/demos/vao_demo.c
@@ -272,7 +272,7 @@ static void Key( unsigned char key, int x, int y )
 
 static void Init( void )
 {
-   const char * const ver_string = (const char * const)
+   const char * const ver_string = (const char *)
        glGetString( GL_VERSION );
 
    printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));