diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qopengltimerquery.cpp | 8 | ||||
| -rw-r--r-- | src/opengl/qopenglvertexarrayobject.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/qopengltimerquery.cpp b/src/opengl/qopengltimerquery.cpp index 44955d48fc..d5ef875efa 100644 --- a/src/opengl/qopengltimerquery.cpp +++ b/src/opengl/qopengltimerquery.cpp @@ -143,11 +143,11 @@ bool QOpenGLTimerQueryPrivate::create() // Check to see if we also need to resolve the functions for EXT_timer_query QSurfaceFormat f = context->format(); - if (f.version() <= qMakePair<int, int>(3, 2) + if (f.version() <= qMakePair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { ext = new QExtTimerQueryHelper(context); - } else if (f.version() <= qMakePair<int, int>(3, 2) + } else if (f.version() <= qMakePair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { qWarning("QOpenGLTimerQuery requires one of:\n" @@ -530,11 +530,11 @@ bool QOpenGLTimeMonitorPrivate::create() // Check to see if we also need to resolve the functions for EXT_timer_query QSurfaceFormat f = context->format(); - if (f.version() <= qMakePair<int, int>(3, 2) + if (f.version() <= qMakePair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { ext = new QExtTimerQueryHelper(context); - } else if (f.version() <= qMakePair<int, int>(3, 2) + } else if (f.version() <= qMakePair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { qWarning("QOpenGLTimeMonitor requires one of:\n" diff --git a/src/opengl/qopenglvertexarrayobject.cpp b/src/opengl/qopenglvertexarrayobject.cpp index 7f28a0bc61..44a0640567 100644 --- a/src/opengl/qopenglvertexarrayobject.cpp +++ b/src/opengl/qopenglvertexarrayobject.cpp @@ -176,7 +176,7 @@ bool QOpenGLVertexArrayObjectPrivate::create() vaoFuncsType = NotSupported; QSurfaceFormat format = ctx->format(); #if !QT_CONFIG(opengles2) - if (format.version() >= qMakePair<int, int>(3,2)) { + if (format.version() >= qMakePair(3,2)) { vaoFuncs.core_3_2 = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_2_Core>(ctx); vaoFuncsType = Core_3_2; vaoFuncs.core_3_2->glGenVertexArrays(1, &vao); |