projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 aebf23a78c8cabfa3bd7270ce4a82906e7c85bb4..2f44c388d8a3b7769851de09d6be8bd546ca32e3 100644
(file)
--- a/
progs/util/shaderutil.c
+++ b/
progs/util/shaderutil.c
@@
-25,7
+25,11
@@
GLboolean
ShadersSupported(void)
{
const char *version = (const char *) glGetString(GL_VERSION);
ShadersSupported(void)
{
const char *version = (const char *) glGetString(GL_VERSION);
- if (version[0] == '2' && version[1] == '.') {
+
+ /* NVIDIA binary drivers will return "3.0.0", and they clearly support
+ * shaders.
+ */
+ if (version[0] >= '2' && version[1] == '.') {
return GL_TRUE;
}
else if (glutExtensionSupported("GL_ARB_vertex_shader")
return GL_TRUE;
}
else if (glutExtensionSupported("GL_ARB_vertex_shader")
@@
-34,7
+38,8
@@
ShadersSupported(void)
fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x. This may not work.\n");
return GL_TRUE;
}
fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x. This may not work.\n");
return GL_TRUE;
}
- return GL_TRUE;
+ fprintf(stderr, "Sorry, GLSL not supported with this OpenGL.\n");
+ return GL_FALSE;
}
}