From 2b00beecd24688ffdb580d77a56bfd7f72d8f4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Wed, 13 Mar 2013 17:00:17 +0100 Subject: [PATCH] kwin: Don't require GL_ARB_shading_language_100 This version of GLSL is not supported in a core context. --- libkwineffects/kwinglplatform.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp index 7fd51f1a43..b0d20f4545 100644 --- a/libkwineffects/kwinglplatform.cpp +++ b/libkwineffects/kwinglplatform.cpp @@ -570,10 +570,9 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) m_supportsGLSL = true; m_textureNPOT = true; #else - 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_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") && + m_extensions.contains("GL_ARB_fragment_shader") && + m_extensions.contains("GL_ARB_vertex_shader"); m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two"); #endif @@ -582,10 +581,9 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) GLXContext ctx = glXGetCurrentContext(); m_directRendering = glXIsDirect(display(), ctx); - 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_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") && + m_extensions.contains("GL_ARB_fragment_shader") && + m_extensions.contains("GL_ARB_vertex_shader"); m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two"); #endif