Mesa (master): progs/perf: accept GL3.x also

Keith Whitwell keithw at kemper.freedesktop.org
Thu Sep 24 15:50:01 UTC 2009


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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Wed Sep 23 19:03:07 2009 +0100

progs/perf: accept GL3.x also

---

 progs/perf/glmain.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/progs/perf/glmain.c b/progs/perf/glmain.c
index 22b404e..69cdbce 100644
--- a/progs/perf/glmain.c
+++ b/progs/perf/glmain.c
@@ -121,8 +121,9 @@ PerfShaderProgram(const char *vertShader, const char *fragShader)
 
    {
       const char *version = (const char *) glGetString(GL_VERSION);
-      if (version[0] != '2' || version[1] != '.') {
-         fprintf(stderr, "Error: GL version 2.x required\n");
+      if ((version[0] != '2' && 
+           version[0] != '3') || version[1] != '.') {
+         fprintf(stderr, "Error: GL version 2.x or better required\n");
          exit(1);
       }
    }




More information about the mesa-commit mailing list