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

GLPlatform compiles on EGL

Browse source
This commit is contained in:
Martin Gräßlin 2010-12-12 12:07:56 +01:00
parent 69044f10c5
commit 5c6e32eaed
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/kwinglplatform.cpp
View file

@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <ios>
#ifdef KWIN_HAVE_OPENGL
#ifndef KWIN_HAVE_OPENGLES
namespace KWin
{
@ -503,18 +502,24 @@ void GLPlatform::detect()
m_mesaVersion = parseVersionString(version);
}
#ifdef KWIN_HAVE_OPENGLES
m_directRendering = true;
m_supportsGLSL = true;
m_textureNPOT = true;
#else
GLXContext ctx = glXGetCurrentContext();
m_directRendering = glXIsDirect(display(), ctx);
m_serverVersion = getXServerVersion();
m_kernelVersion = getKernelVersion();
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_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two");
#endif
m_serverVersion = getXServerVersion();
m_kernelVersion = getKernelVersion();
m_glslVersion = 0;
m_glsl_version = QByteArray();
@ -833,6 +838,5 @@ bool GLPlatform::isIntel() const
} // namespace KWin
#endif // KWIN_HAVE_OPENGLES
#endif // KWIN_HAVE_OPENGL