From 567d87744ab7b7c2564ce3ba9969caff214e3334 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Sat, 16 Aug 2008 11:07:51 -0600 Subject: [PATCH] added test for ARB GLSL extensions --- progs/util/shaderutil.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c index 477209a..4f17dd7 100644 --- a/progs/util/shaderutil.c +++ b/progs/util/shaderutil.c @@ -27,12 +27,15 @@ Init(void) GLboolean ShadersSupported(void) { - const char *version; - - version = (const char *) glGetString(GL_VERSION); - if (version[0] != '2' || version[1] != '.') { - printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER)); - return GL_FALSE; + const char *version = (const char *) glGetString(GL_VERSION); + if (version[0] == '2' && version[1] == '.') { + return GL_TRUE; + } + else if (glutExtensionSupported("GL_ARB_vertex_shader") + && glutExtensionSupported("GL_ARB_fragment_shader") + && glutExtensionSupported("GL_ARB_shader_objects")) { + fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x. This may not work.\n"); + return GL_TRUE; } return GL_TRUE; } -- 2.7.4