Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / progs / util / shaderutil.c

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 629b6f1d972d74e6d206e37abc45f3cc3845a439..2f44c388d8a3b7769851de09d6be8bd546ca32e3 100644 (file)
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -38,6 +38,7 @@ ShadersSupported(void)
       fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x.  This may not work.\n");
       return GL_TRUE;
    }
+   fprintf(stderr, "Sorry, GLSL not supported with this OpenGL.\n");
    return GL_FALSE;
 }
 
@@ -88,6 +89,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
    f = fopen(filename, "r");
    if (!f) {
       fprintf(stderr, "Unable to open shader file %s\n", filename);
+      free(buffer);
       return 0;
    }
 
@@ -98,6 +100,8 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      fclose(f);
+      free(buffer);
       return 0;
    }