From 1e8de50674f5b33a50c45224b7e07b3f974f6ab0 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 4 Mar 2014 15:06:36 +0100 Subject: Avoid using direct OpenGL calls in gui and widgets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5d88a2e204ca23e178a4e3044b9cb13392c3e763 Reviewed-by: Jørgen Lind --- src/gui/opengl/qopengl.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gui/opengl/qopengl.cpp') diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 94270ba0c4..b452c605e3 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -53,7 +53,9 @@ typedef const GLubyte * (QOPENGLF_APIENTRYP qt_glGetStringi)(GLenum, GLuint); QOpenGLExtensionMatcher::QOpenGLExtensionMatcher() { - const char *extensionStr = reinterpret_cast(glGetString(GL_EXTENSIONS)); + QOpenGLContext *ctx = QOpenGLContext::currentContext(); + QOpenGLFunctions *funcs = ctx->functions(); + const char *extensionStr = reinterpret_cast(funcs->glGetString(GL_EXTENSIONS)); if (extensionStr) { QByteArray ba(extensionStr); @@ -64,9 +66,8 @@ QOpenGLExtensionMatcher::QOpenGLExtensionMatcher() #else } else { // clear error state - while (glGetError()) {} + while (funcs->glGetError()) {} - QOpenGLContext *ctx = QOpenGLContext::currentContext(); if (ctx) { qt_glGetStringi glGetStringi = (qt_glGetStringi)ctx->getProcAddress("glGetStringi"); @@ -74,7 +75,7 @@ QOpenGLExtensionMatcher::QOpenGLExtensionMatcher() return; GLint numExtensions; - glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions); + funcs->glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions); for (int i = 0; i < numExtensions; ++i) { const char *str = reinterpret_cast(glGetStringi(GL_EXTENSIONS, i)); -- cgit v1.2.3