diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-06 22:36:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:30 +0100 |
| commit | 159f42222d06acd9a7ea9b25167e52060d47ab4c (patch) | |
| tree | 0c0e18cdf8ce605d147df8ac738ce0ffa07a4d75 /src/opengl/qglfunctions.cpp | |
| parent | 3250ec0c8f9666cd3dbb724894cd529d5af51ffb (diff) | |
Remove duplicated code for handling OpenGL extensions in QtOpenGL
We now re-use QOpenGLExtensions/Functions from QtGui in the same way
as QtGui uses these classes. There is still some duplicated logic
in qglfunctions.cpp, but this code now at least uses the shared
QOpenGLExtensionMatcher class.
Change-Id: Ie04008c43d430ae805e6ec1c45e7e363deeb3b8f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/opengl/qglfunctions.cpp')
| -rw-r--r-- | src/opengl/qglfunctions.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index 5ec691073f..3d3bc0e947 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -42,6 +42,7 @@ #include "qglfunctions.h" #include "qgl_p.h" #include "QtGui/private/qopenglcontext_p.h" +#include <private/qopengl_p.h> QT_BEGIN_NAMESPACE @@ -225,7 +226,7 @@ static int qt_gl_resolve_features() QGLFunctions::CompressedTextures | QGLFunctions::Multisample | QGLFunctions::StencilSeparate; - QGLExtensionMatcher extensions; + QOpenGLExtensionMatcher extensions; if (extensions.match("GL_OES_texture_npot")) features |= QGLFunctions::NPOTTextures; if (extensions.match("GL_IMG_texture_npot")) @@ -236,7 +237,7 @@ static int qt_gl_resolve_features() QGLFunctions::Buffers | QGLFunctions::CompressedTextures | QGLFunctions::Multisample; - QGLExtensionMatcher extensions; + QOpenGLExtensionMatcher extensions; if (extensions.match("GL_OES_framebuffer_object")) features |= QGLFunctions::Framebuffers; if (extensions.match("GL_OES_blend_equation_separate")) @@ -253,7 +254,7 @@ static int qt_gl_resolve_features() #else int features = 0; QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags(); - QGLExtensionMatcher extensions; + QOpenGLExtensionMatcher extensions; // Recognize features by extension name. if (extensions.match("GL_ARB_multitexture")) |