i965g: Remove unnecessary headers.

[mesa.git] / progs / glsl / multitex.c

diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index 6ec9c833e67479ede193445faabd3b040a3a9046..49b32253eed860a652cd19d6ae004a7ca5e93e1a 100644 (file)
--- a/progs/glsl/multitex.c
+++ b/progs/glsl/multitex.c
@@ -331,6 +331,8 @@ CreateProgram(const char *vertProgFile, const char *fragProgFile,
    SetUniformValues(program, uniforms);
    PrintUniforms(Uniforms);
 
+   assert(ValidateShaderProgram(program));
+
    VertCoord_attr = glGetAttribLocation(program, "VertCoord");
    if (VertCoord_attr > 0) {
       /* We want the VertCoord attrib to have position zero so that
@@ -367,12 +369,9 @@ InitPrograms(void)
 static void
 InitGL(void)
 {
-   const char *version = (const char *) glGetString(GL_VERSION);
+   if (!ShadersSupported())
+      exit(1);
 
-   if (version[0] != '2' || version[1] != '.') {
-      printf("Warning: this program expects OpenGL 2.0\n");
-      /*exit(1);*/
-   }
    printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));
    printf("Usage:\n");
    printf("  a     - toggle arrays vs. immediate mode rendering\n");