diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-03-20 12:10:37 +0100 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-06-20 21:35:12 +0000 |
commit | 57b6b2f5273017f2d1fa8d3e055c5001ecd84e5d (patch) | |
tree | 906d960a83144c49e8db1a0770e3770fa1ce1697 /src/gui/util | |
parent | e80a3b49c0aac237104e1696fc64b3a924c89ca1 (diff) |
[Shader Graph Gen.] Introduce QShaderFormat
This is the first building block toward a node based generator for
shader programs.
QShaderFormat will be used by the other classes to qualify in which
format the code snippets and includes used are.
Change-Id: I11aefc6bb359832a853ed1b6bec302dc3516cfc4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qshaderformat.cpp | 130 | ||||
-rw-r--r-- | src/gui/util/qshaderformat_p.h | 109 | ||||
-rw-r--r-- | src/gui/util/util.pri | 6 |
3 files changed, 243 insertions, 2 deletions
diff --git a/src/gui/util/qshaderformat.cpp b/src/gui/util/qshaderformat.cpp new file mode 100644 index 0000000000..373bfb9e7e --- /dev/null +++ b/src/gui/util/qshaderformat.cpp @@ -0,0 +1,130 @@ +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ + +#include "qshaderformat_p.h" + +QT_BEGIN_NAMESPACE + +QShaderFormat::QShaderFormat() Q_DECL_NOTHROW + : m_api(NoApi) +{ +} + +QShaderFormat::Api QShaderFormat::api() const Q_DECL_NOTHROW +{ + return m_api; +} + +void QShaderFormat::setApi(QShaderFormat::Api api) Q_DECL_NOTHROW +{ + m_api = api; +} + +QVersionNumber QShaderFormat::version() const Q_DECL_NOTHROW +{ + return m_version; +} + +void QShaderFormat::setVersion(const QVersionNumber &version) Q_DECL_NOTHROW +{ + m_version = version; +} + +QStringList QShaderFormat::extensions() const Q_DECL_NOTHROW +{ + return m_extensions; +} + +void QShaderFormat::setExtensions(const QStringList &extensions) Q_DECL_NOTHROW +{ + m_extensions = extensions; + m_extensions.sort(); +} + +QString QShaderFormat::vendor() const Q_DECL_NOTHROW +{ + return m_vendor; +} + +void QShaderFormat::setVendor(const QString &vendor) Q_DECL_NOTHROW +{ + m_vendor = vendor; +} + +bool QShaderFormat::isValid() const Q_DECL_NOTHROW +{ + return m_api != NoApi && m_version.majorVersion() > 0; +} + +bool QShaderFormat::supports(const QShaderFormat &other) const Q_DECL_NOTHROW +{ + if (!isValid() || !other.isValid()) + return false; + + if (m_api == OpenGLES && m_api != other.m_api) + return false; + + if (m_api == OpenGLCoreProfile && m_api != other.m_api) + return false; + + if (m_version < other.m_version) + return false; + + const auto containsAllExtensionsFromOther = std::includes(m_extensions.constBegin(), + m_extensions.constEnd(), + other.m_extensions.constBegin(), + other.m_extensions.constEnd()); + if (!containsAllExtensionsFromOther) + return false; + + if (!other.m_vendor.isEmpty() && m_vendor != other.m_vendor) + return false; + + return true; +} + +bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW +{ + return lhs.api() == rhs.api() + && lhs.version() == rhs.version() + && lhs.extensions() == rhs.extensions() + && lhs.vendor() == rhs.vendor(); +} + +QT_END_NAMESPACE diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h new file mode 100644 index 0000000000..064c2364a7 --- /dev/null +++ b/src/gui/util/qshaderformat_p.h @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ + +#ifndef QSHADERFORMAT_P_H +#define QSHADERFORMAT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtGui/private/qtguiglobal_p.h> + +#include <QtCore/qstringlist.h> +#include <QtCore/qversionnumber.h> + +QT_BEGIN_NAMESPACE + +class QShaderFormat +{ +public: + enum Api : int { + NoApi, + OpenGLNoProfile, + OpenGLCoreProfile, + OpenGLCompatibilityProfile, + OpenGLES + }; + + Q_GUI_EXPORT QShaderFormat() Q_DECL_NOTHROW; + + Q_GUI_EXPORT Api api() const Q_DECL_NOTHROW; + Q_GUI_EXPORT void setApi(Api api) Q_DECL_NOTHROW; + + Q_GUI_EXPORT QVersionNumber version() const Q_DECL_NOTHROW; + Q_GUI_EXPORT void setVersion(const QVersionNumber &version) Q_DECL_NOTHROW; + + Q_GUI_EXPORT QStringList extensions() const Q_DECL_NOTHROW; + Q_GUI_EXPORT void setExtensions(const QStringList &extensions) Q_DECL_NOTHROW; + + Q_GUI_EXPORT QString vendor() const Q_DECL_NOTHROW; + Q_GUI_EXPORT void setVendor(const QString &vendor) Q_DECL_NOTHROW; + + Q_GUI_EXPORT bool isValid() const Q_DECL_NOTHROW; + Q_GUI_EXPORT bool supports(const QShaderFormat &other) const Q_DECL_NOTHROW; + +private: + Api m_api; + QVersionNumber m_version; + QStringList m_extensions; + QString m_vendor; +}; + +Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW; + +inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW +{ + return !(lhs == rhs); +} + +Q_DECLARE_TYPEINFO(QShaderFormat, Q_MOVABLE_TYPE); + +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QShaderFormat) + +#endif // QSHADERFORMAT_P_H diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri index 79c83599b9..2073a0a825 100644 --- a/src/gui/util/util.pri +++ b/src/gui/util/util.pri @@ -6,11 +6,13 @@ HEADERS += \ util/qvalidator.h \ util/qgridlayoutengine_p.h \ util/qabstractlayoutstyleinfo_p.h \ - util/qlayoutpolicy_p.h + util/qlayoutpolicy_p.h \ + util/qshaderformat_p.h SOURCES += \ util/qdesktopservices.cpp \ util/qvalidator.cpp \ util/qgridlayoutengine.cpp \ util/qabstractlayoutstyleinfo.cpp \ - util/qlayoutpolicy.cpp + util/qlayoutpolicy.cpp \ + util/qshaderformat.cpp |