yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kwin: Don't require GL_ARB_shading_language_100

Browse source 
This version of GLSL is not supported in a core context.
This commit is contained in:
Fredrik Höglund 2013-03-13 17:00:17 +01:00
parent 5b80d8d513
commit 2b00beecd2
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libkwineffects/kwinglplatform.cpp
View file

@ -570,8 +570,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_supportsGLSL = true; m_supportsGLSL = true;
m_textureNPOT = true; m_textureNPOT = true;
#else #else
m_supportsGLSL = m_extensions.contains("GL_ARB_shading_language_100") && m_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") &&
m_extensions.contains("GL_ARB_shader_objects") &&
m_extensions.contains("GL_ARB_fragment_shader") && m_extensions.contains("GL_ARB_fragment_shader") &&
m_extensions.contains("GL_ARB_vertex_shader"); m_extensions.contains("GL_ARB_vertex_shader");
@ -582,8 +581,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
GLXContext ctx = glXGetCurrentContext(); GLXContext ctx = glXGetCurrentContext();
m_directRendering = glXIsDirect(display(), ctx); m_directRendering = glXIsDirect(display(), ctx);
m_supportsGLSL = m_extensions.contains("GL_ARB_shading_language_100") && m_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") &&
m_extensions.contains("GL_ARB_shader_objects") &&
m_extensions.contains("GL_ARB_fragment_shader") && m_extensions.contains("GL_ARB_fragment_shader") &&
m_extensions.contains("GL_ARB_vertex_shader"); m_extensions.contains("GL_ARB_vertex_shader");