vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't query GL_SHADING_LANGUAGE_VERSION when GLSL isn't supported. 

svn path=/trunk/KDE/kdebase/workspace/; revision=1201788
icc-effect-5.14.5
Fredrik Höglund 2010-11-28 17:16:45 +00:00
parent 74101f90f7
commit f5a25b4ebb
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/kwinglplatform.cpp
View File

@ -426,7 +426,6 @@ void GLPlatform::detect()
m_vendor = (const char*)glGetString(GL_VENDOR);
m_renderer = (const char*)glGetString(GL_RENDERER);
m_version = (const char*)glGetString(GL_VERSION);
m_glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
const QByteArray extensions = (const char*)glGetString(GL_EXTENSIONS);
m_extensions = QSet<QByteArray>::fromList(extensions.split(' '));
@ -445,13 +444,6 @@ void GLPlatform::detect()
m_mesaVersion = parseVersionString(version);
}
// Parse the GLSL version
const QList<QByteArray> glslVersionTokens = m_glsl_version.split(' ');
if (glslVersionTokens.count() > 0) {
const QByteArray version = glslVersionTokens.at(0);
m_glslVersion = parseVersionString(version);
}
GLXContext ctx = glXGetCurrentContext();
m_directRendering = glXIsDirect(display(), ctx);
@ -461,11 +453,23 @@ void GLPlatform::detect()
m_supportsGLSL = m_extensions.contains("GL_ARB_shading_language_100") &&
m_extensions.contains("GL_ARB_shader_objects") &&
m_extensions.contains("GL_ARB_fragment_shader") &&
m_extensions.contains("GL_ARB_vertex_shader") &&
m_glslVersion >= kVersionNumber(1, 0);
m_extensions.contains("GL_ARB_vertex_shader");
m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two");
m_glslVersion = 0;
m_glsl_version = QByteArray();
if (m_supportsGLSL) {
// Parse the GLSL version
m_glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
const QList<QByteArray> glslVersionTokens = m_glsl_version.split(' ');
if (glslVersionTokens.count() > 0) {
const QByteArray version = glslVersionTokens.at(0);
m_glslVersion = parseVersionString(version);
}
}
m_chipset = "Unknown";