diff options
Diffstat (limited to 'src/gui/opengl/qopenglfunctions.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index aafa5327e03..5e86b561072 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -300,11 +300,11 @@ static int qt_gl_resolve_features() QOpenGLFunctions::NPOTTextureRepeat; } - const QPair<int, int> version = format.version(); - if (version < qMakePair(3, 0) - || (version == qMakePair(3, 0) && format.testOption(QSurfaceFormat::DeprecatedFunctions)) - || (version == qMakePair(3, 1) && extensions.match("GL_ARB_compatibility")) - || (version >= qMakePair(3, 2) && format.profile() == QSurfaceFormat::CompatibilityProfile)) { + const std::pair<int, int> version = format.version(); + if (version < std::pair(3, 0) + || (version == std::pair(3, 0) && format.testOption(QSurfaceFormat::DeprecatedFunctions)) + || (version == std::pair(3, 1) && extensions.match("GL_ARB_compatibility")) + || (version >= std::pair(3, 2) && format.profile() == QSurfaceFormat::CompatibilityProfile)) { features |= QOpenGLFunctions::FixedFunctionPipeline; } return features; @@ -421,10 +421,10 @@ static int qt_gl_resolve_extensions() | QOpenGLExtensions::MapBuffer | QOpenGLExtensions::Sized16Formats; - if (format.version() >= qMakePair(1, 2)) + if (format.version() >= std::pair(1, 2)) extensions |= QOpenGLExtensions::BGRATextureFormat; - if (format.version() >= qMakePair(1, 4) || extensionMatcher.match("GL_SGIS_generate_mipmap")) + if (format.version() >= std::pair(1, 4) || extensionMatcher.match("GL_SGIS_generate_mipmap")) extensions |= QOpenGLExtensions::GenerateMipmap; if (format.majorVersion() >= 2) @@ -445,13 +445,13 @@ static int qt_gl_resolve_extensions() extensions |= QOpenGLExtensions::PackedDepthStencil; } - if (format.version() >= qMakePair(3, 2) || extensionMatcher.match("GL_ARB_geometry_shader4")) + if (format.version() >= std::pair(3, 2) || extensionMatcher.match("GL_ARB_geometry_shader4")) extensions |= QOpenGLExtensions::GeometryShaders; - if (format.version() >= qMakePair(3, 3)) + if (format.version() >= std::pair(3, 3)) extensions |= QOpenGLExtensions::TextureSwizzle; - if (format.version() >= qMakePair(4, 3) || extensionMatcher.match("GL_ARB_invalidate_subdata")) + if (format.version() >= std::pair(4, 3) || extensionMatcher.match("GL_ARB_invalidate_subdata")) extensions |= QOpenGLExtensions::DiscardFramebuffer; if (extensionMatcher.match("GL_ARB_map_buffer_range")) |