From fdf175d7d0e46f0eef4778108951a3d30794a2de Mon Sep 17 00:00:00 2001 From: vrld Date: Tue, 11 Sep 2012 15:21:39 +0200 Subject: [PATCH] Partly fix issue #468: Incorrect(?) detection of shader support. Still need to figure out if we can use the ARB versions. --- src/modules/graphics/opengl/PixelEffect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/PixelEffect.cpp b/src/modules/graphics/opengl/PixelEffect.cpp index e9da1233d..5bd544a59 100644 --- a/src/modules/graphics/opengl/PixelEffect.cpp +++ b/src/modules/graphics/opengl/PixelEffect.cpp @@ -155,9 +155,9 @@ void PixelEffect::unloadVolatile() std::string PixelEffect::getGLSLVersion() { - // GL_SHADING_LANGUAGE_VERSION is not available in OpenGL < 2.1. - // Be very pessimistic about the GLSL version in that case. - if (!GLEE_VERSION_2_1) + // GL_SHADING_LANGUAGE_VERSION may not be available in OpenGL < 2.0. + const char *tmp = glGetString(GL_SHADING_LANGUAGE_VERSION); + if (NULL == tmp) return "0.0"; // the version string always begins with a version number of the format