Mesa (master): progs/glsl: use ShadersSupported()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 89e20ab3aeff37f0eff79ab0c5e73be3d3185ce8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89e20ab3aeff37f0eff79ab0c5e73be3d3185ce8

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Nov 17 19:22:29 2009 -0700

progs/glsl: use ShadersSupported()

---

 progs/glsl/multitex.c |    7 ++-----
 progs/glsl/texdemo1.c |    7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index bf46fd5..49b3225 100644
--- a/progs/glsl/multitex.c
+++ b/progs/glsl/multitex.c
@@ -369,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");
diff --git a/progs/glsl/texdemo1.c b/progs/glsl/texdemo1.c
index 5b1913a..2076e6a 100644
--- a/progs/glsl/texdemo1.c
+++ b/progs/glsl/texdemo1.c
@@ -400,11 +400,8 @@ InitPrograms(void)
 static void
 Init(GLboolean useImageFiles)
 {
-   const char *version = (const char *) glGetString(GL_VERSION);
-
-   if (version[0] != '2' || version[1] != '.') {
-      printf("Warning: this program expects OpenGL 2.0\n");
-      /*exit(1);*/
+   if (!ShadersSupported()) {
+      exit(1);
    }
    printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));