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

[libkwinglutils] hasGLVersion uses GLPlatform for verison check

Browse source 
Summary: No need to parse the OpenGL version twice with different algorithms.

Reviewers: #kwin, bshah

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D2414
This commit is contained in:
Martin Gräßlin 2016-08-12 08:48:34 +02:00
parent a5c8356d40
commit b4c6b4b35d
1 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libkwineffects/kwinglutils.cpp
View file

@ -64,8 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin namespace KWin
{ {
// Variables // Variables
// GL version, use MAKE_GL_VERSION() macro for comparing with a specific version
static int glVersion;
// GLX version, use MAKE_GL_VERSION() macro for comparing with a specific version // GLX version, use MAKE_GL_VERSION() macro for comparing with a specific version
static int glXVersion; static int glXVersion;
// EGL version, use MAKE_GL_VERSION() macro for comparing with a specific version // EGL version, use MAKE_GL_VERSION() macro for comparing with a specific version
@ -108,21 +106,6 @@ void initEGL()
void initGL(OpenGLPlatformInterface platformInterface) void initGL(OpenGLPlatformInterface platformInterface)
{ {
// Get OpenGL version
const char* glversioncstring = (const char*)glGetString(GL_VERSION);
QByteArray glversionstring = QByteArray::fromRawData(glversioncstring, qstrlen(glversioncstring));
if (glversionstring.startsWith("OpenGL ES ")) {
glversionstring = glversionstring.mid(10);
}
const int whiteSpaceIndex = glversionstring.indexOf(' ');
if (whiteSpaceIndex != -1) {
glversionstring.truncate(whiteSpaceIndex);
}
auto glversioninfo = glversionstring.split('.');
while (glversioninfo.count() < 3)
glversioninfo << "0";
glVersion = MAKE_GL_VERSION(glversioninfo[0].toInt(), glversioninfo[1].toInt(), glversioninfo[2].toInt());
// Get list of supported OpenGL extensions // Get list of supported OpenGL extensions
if (hasGLVersion(3, 0)) { if (hasGLVersion(3, 0)) {
int count; int count;
@ -155,7 +138,6 @@ void cleanupGL()
s_glxExtensions.clear(); s_glxExtensions.clear();
s_eglExtensions.clear(); s_eglExtensions.clear();
glVersion = 0;
glXVersion = 0; glXVersion = 0;
eglVersion = 0; eglVersion = 0;
glTextureUnitsCount = 0; glTextureUnitsCount = 0;
@ -163,7 +145,7 @@ void cleanupGL()
bool hasGLVersion(int major, int minor, int release) bool hasGLVersion(int major, int minor, int release)
{ {
return glVersion >= MAKE_GL_VERSION(major, minor, release); return GLPlatform::instance()->glVersion() >= kVersionNumber(major, minor, release);
} }
bool hasGLXVersion(int major, int minor, int release) bool hasGLXVersion(int major, int minor, int release)