Merge remote branch 'origin/master' into arb_geometry_shader4arb_geometry_shader4

Conflicts:
	src/gallium/auxiliary/tgsi/tgsi_exec.c
	src/mesa/glapi/glapitemp.h
	src/mesa/glapi/glprocs.h
	src/mesa/main/enums.c
	src/mesa/main/remap_helper.h
	src/mesa/state_tracker/st_atom_shader.c
	src/mesa/state_tracker/st_program.c
	src/mesa/state_tracker/st_program.h

1 files changed, 3 insertions, 1 deletions

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index af50d64f51..4fb3199a19 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -34,7 +34,8 @@ ShadersSupported(void)
       fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x.  This may not work.\n");
       return GL_TRUE;
    }
-   return GL_TRUE;
+   fprintf(stderr, "Sorry, GLSL not supported with this OpenGL.\n");
+   return GL_FALSE;
 }
 
 
@@ -95,6 +96,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      fclose(f);
       free(buffer);
       return 0;
    }