diff options
Diffstat (limited to 'src/gui/opengl/qopenglversionfunctionsfactory.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglversionfunctionsfactory.cpp | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/gui/opengl/qopenglversionfunctionsfactory.cpp b/src/gui/opengl/qopenglversionfunctionsfactory.cpp index 35fe14ca54..ef9fcd4acd 100644 --- a/src/gui/opengl/qopenglversionfunctionsfactory.cpp +++ b/src/gui/opengl/qopenglversionfunctionsfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -43,6 +43,10 @@ #include "qopenglversionfunctionsfactory_p.h" #if !defined(QT_OPENGL_ES_2) +#include "qopenglfunctions_4_5_core.h" +#include "qopenglfunctions_4_5_compatibility.h" +#include "qopenglfunctions_4_4_core.h" +#include "qopenglfunctions_4_4_compatibility.h" #include "qopenglfunctions_4_3_core.h" #include "qopenglfunctions_4_3_compatibility.h" #include "qopenglfunctions_4_2_core.h" @@ -80,7 +84,11 @@ QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVe if (versionProfile.hasProfiles()) { switch (versionProfile.profile()) { case QSurfaceFormat::CoreProfile: - if (major == 4 && minor == 3) + if (major == 4 && minor == 5) + return new QOpenGLFunctions_4_5_Core; + else if (major == 4 && minor == 4) + return new QOpenGLFunctions_4_4_Core; + else if (major == 4 && minor == 3) return new QOpenGLFunctions_4_3_Core; else if (major == 4 && minor == 2) return new QOpenGLFunctions_4_2_Core; @@ -95,7 +103,11 @@ QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVe break; case QSurfaceFormat::CompatibilityProfile: - if (major == 4 && minor == 3) + if (major == 4 && minor == 5) + return new QOpenGLFunctions_4_5_Compatibility; + else if (major == 4 && minor == 4) + return new QOpenGLFunctions_4_4_Compatibility; + else if (major == 4 && minor == 3) return new QOpenGLFunctions_4_3_Compatibility; else if (major == 4 && minor == 2) return new QOpenGLFunctions_4_2_Compatibility; |