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

[kwineffects] Runtime depend on gles in GLPlatform

Browse source
This commit is contained in:
Martin Gräßlin 2015-10-30 10:20:42 +01:00
parent 78ac6aaf13
commit 49d8502567
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libkwineffects/kwinglplatform.cpp
View file

@ -542,8 +542,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
} }
} }
#ifndef KWIN_HAVE_OPENGLES if (!isGLES() && m_glVersion >= kVersionNumber(3, 0)) {
if (m_glVersion >= kVersionNumber(3, 0)) {
int count; int count;
glGetIntegerv(GL_NUM_EXTENSIONS, &count); glGetIntegerv(GL_NUM_EXTENSIONS, &count);
@ -551,9 +550,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
const char *name = (const char *) glGetStringi(GL_EXTENSIONS, i); const char *name = (const char *) glGetStringi(GL_EXTENSIONS, i);
m_extensions.insert(name); m_extensions.insert(name);
} }
} else } else {
#endif
{
const QByteArray extensions = (const char *) glGetString(GL_EXTENSIONS); const QByteArray extensions = (const char *) glGetString(GL_EXTENSIONS);
m_extensions = QSet<QByteArray>::fromList(extensions.split(' ')); m_extensions = QSet<QByteArray>::fromList(extensions.split(' '));
} }
@ -566,24 +563,22 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
} }
if (platformInterface == EglPlatformInterface) { if (platformInterface == EglPlatformInterface) {
#ifdef KWIN_HAVE_OPENGLES if (isGLES()) {
m_supportsGLSL = true; m_supportsGLSL = true;
m_textureNPOT = true; m_textureNPOT = true;
#else } else {
m_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") && m_supportsGLSL = 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");
m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two"); m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two");
#endif }
} else if (platformInterface == GlxPlatformInterface) { } else if (platformInterface == GlxPlatformInterface) {
#ifndef KWIN_HAVE_OPENGLES
m_supportsGLSL = m_extensions.contains("GL_ARB_shader_objects") && m_supportsGLSL = 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");
m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two"); m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two");
#endif
} }
m_serverVersion = getXServerVersion(); m_serverVersion = getXServerVersion();