diff options
Diffstat (limited to 'src/gui/opengl/qopengl_p.h')
| -rw-r--r-- | src/gui/opengl/qopengl_p.h | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/src/gui/opengl/qopengl_p.h b/src/gui/opengl/qopengl_p.h index 0a3da9489a..377440455a 100644 --- a/src/gui/opengl/qopengl_p.h +++ b/src/gui/opengl/qopengl_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** 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$ @@ -48,9 +48,13 @@ #include <qopengl.h> #include <private/qopenglcontext_p.h> #include <QtCore/qset.h> +#include <QtCore/qstring.h> +#include <private/qversionnumber_p.h> QT_BEGIN_NAMESPACE +class QJsonDocument; + class Q_GUI_EXPORT QOpenGLExtensionMatcher { public: @@ -67,6 +71,28 @@ private: QSet<QByteArray> m_extensions; }; +class Q_GUI_EXPORT QOpenGLConfig +{ +public: + struct Gpu { + Gpu() : vendorId(0), deviceId(0) {} + bool isValid() const { return deviceId; } + + uint vendorId; + uint deviceId; + QVersionNumber driverVersion; + }; + + static QSet<QString> gpuFeatures(const Gpu &gpu, + const QString &osName, const QVersionNumber &kernelVersion, + const QJsonDocument &doc); + static QSet<QString> gpuFeatures(const Gpu &gpu, + const QString &osName, const QVersionNumber &kernelVersion, + const QString &fileName); + static QSet<QString> gpuFeatures(const Gpu &gpu, const QJsonDocument &doc); + static QSet<QString> gpuFeatures(const Gpu &gpu, const QString &fileName); +}; + QT_END_NAMESPACE #endif // QOPENGL_H |