diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-22 17:01:30 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-16 07:14:51 +0200 |
| commit | 73f3f501f331444b3f188b21db7265f723e4f383 (patch) | |
| tree | 06eb8f50e1cbb71579210c678089e169cacb4977 /src/gui/opengl/qopenglversionfunctionsfactory.cpp | |
| parent | ca635c659c9d3d7418779a48b70b471abe25c577 (diff) | |
Move versioned OpenGL functions from QtGui to QtOpenGL
The context—which lives in QtGui—now knows nothing about versioned functions.
This changes the public API for getting version functions for a context.
[ChangeLog][QtGui][OpenGL] QOpenGLContext::versionFunctions() has been removed.
QOpenGLVersionFunctionsFactory::get() from the QtOpenGL module should be used
instead.
Previously one would call
context->versionFunctions<QOpenGLFunctions_4_0_Core>();
Which now becomes
QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_0_Core>(context);
The rest of the API should be identical.
Since glgen no longer compiles, and the links to its input (gl.spec and gl.tm)
are dead, I've edited the previously generated files manually. If glgen is
fixed, it should be quite easy to make it generate the new way.
Task-number: QTBUG-74409
Change-Id: I800527e0af16a79005b276eeb74417770193c62f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/opengl/qopenglversionfunctionsfactory.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglversionfunctionsfactory.cpp | 163 |
1 files changed, 0 insertions, 163 deletions
diff --git a/src/gui/opengl/qopenglversionfunctionsfactory.cpp b/src/gui/opengl/qopenglversionfunctionsfactory.cpp deleted file mode 100644 index ca7daedf34f..00000000000 --- a/src/gui/opengl/qopenglversionfunctionsfactory.cpp +++ /dev/null @@ -1,163 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** -** This file was generated by glgen version 0.1 -** Command line was: glgen -** -** glgen is Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** -** This is an auto-generated file. -** Do not edit! All changes made to it will be lost. -** -****************************************************************************/ - -#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" -#include "qopenglfunctions_4_2_compatibility.h" -#include "qopenglfunctions_4_1_core.h" -#include "qopenglfunctions_4_1_compatibility.h" -#include "qopenglfunctions_4_0_core.h" -#include "qopenglfunctions_4_0_compatibility.h" -#include "qopenglfunctions_3_3_core.h" -#include "qopenglfunctions_3_3_compatibility.h" -#include "qopenglfunctions_3_2_core.h" -#include "qopenglfunctions_3_2_compatibility.h" -#include "qopenglfunctions_3_1.h" -#include "qopenglfunctions_3_0.h" -#include "qopenglfunctions_2_1.h" -#include "qopenglfunctions_2_0.h" -#include "qopenglfunctions_1_5.h" -#include "qopenglfunctions_1_4.h" -#include "qopenglfunctions_1_3.h" -#include "qopenglfunctions_1_2.h" -#include "qopenglfunctions_1_1.h" -#include "qopenglfunctions_1_0.h" -#else -#include "qopenglfunctions_es2.h" -#endif - -QT_BEGIN_NAMESPACE - -QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVersionProfile &versionProfile) -{ -#if !defined(QT_OPENGL_ES_2) - const int major = versionProfile.version().first; - const int minor = versionProfile.version().second; - - if (versionProfile.hasProfiles()) { - switch (versionProfile.profile()) { - case QSurfaceFormat::CoreProfile: - 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; - else if (major == 4 && minor == 1) - return new QOpenGLFunctions_4_1_Core; - else if (major == 4 && minor == 0) - return new QOpenGLFunctions_4_0_Core; - else if (major == 3 && minor == 3) - return new QOpenGLFunctions_3_3_Core; - else if (major == 3 && minor == 2) - return new QOpenGLFunctions_3_2_Core; - break; - - case QSurfaceFormat::CompatibilityProfile: - 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; - else if (major == 4 && minor == 1) - return new QOpenGLFunctions_4_1_Compatibility; - else if (major == 4 && minor == 0) - return new QOpenGLFunctions_4_0_Compatibility; - else if (major == 3 && minor == 3) - return new QOpenGLFunctions_3_3_Compatibility; - else if (major == 3 && minor == 2) - return new QOpenGLFunctions_3_2_Compatibility; - break; - - case QSurfaceFormat::NoProfile: - default: - break; - }; - } else { - if (major == 3 && minor == 1) - return new QOpenGLFunctions_3_1; - else if (major == 3 && minor == 0) - return new QOpenGLFunctions_3_0; - else if (major == 2 && minor == 1) - return new QOpenGLFunctions_2_1; - else if (major == 2 && minor == 0) - return new QOpenGLFunctions_2_0; - else if (major == 1 && minor == 5) - return new QOpenGLFunctions_1_5; - else if (major == 1 && minor == 4) - return new QOpenGLFunctions_1_4; - else if (major == 1 && minor == 3) - return new QOpenGLFunctions_1_3; - else if (major == 1 && minor == 2) - return new QOpenGLFunctions_1_2; - else if (major == 1 && minor == 1) - return new QOpenGLFunctions_1_1; - else if (major == 1 && minor == 0) - return new QOpenGLFunctions_1_0; - } - return nullptr; -#else - Q_UNUSED(versionProfile); - return new QOpenGLFunctions_ES2; -#endif -} - -QT_END_NAMESPACE |