diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-02 13:13:05 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-07 19:06:59 +0000 |
commit | 4db53c73453094a9a68e8ff7194b1bd99f2bc4cb (patch) | |
tree | 81115e7d94ac6f1e2ac2afbfe267ad95b457c387 /src/render | |
parent | dde3c565835a9ddd0edf980728db4f6ff7393160 (diff) |
Add QDispatchCompute framegraph node
Will be used to dispatch a compute job if the renderer
is compatible with compute shaders (OpenG 4.3)
Change-Id: I7846d3b58d6aed06276aa34e841245ce1154fdd8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/framegraph/framegraph.pri | 6 | ||||
-rw-r--r-- | src/render/framegraph/qdispatchcompute.cpp | 127 | ||||
-rw-r--r-- | src/render/framegraph/qdispatchcompute.h | 85 |
3 files changed, 216 insertions, 2 deletions
diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri index b40b68932..c69da622c 100644 --- a/src/render/framegraph/framegraph.pri +++ b/src/render/framegraph/framegraph.pri @@ -46,7 +46,8 @@ HEADERS += \ $$PWD/frustumculling_p.h \ $$PWD/qlighting.h \ $$PWD/qlighting_p.h \ - $$PWD/lighting_p.h + $$PWD/lighting_p.h \ + $$PWD/qdispatchcompute.h SOURCES += \ $$PWD/cameraselectornode.cpp \ @@ -80,4 +81,5 @@ SOURCES += \ $$PWD/qfrustumculling.cpp \ $$PWD/frustumculling.cpp \ $$PWD/qlighting.cpp \ - $$PWD/lighting.cpp + $$PWD/lighting.cpp \ + $$PWD/qdispatchcompute.cpp diff --git a/src/render/framegraph/qdispatchcompute.cpp b/src/render/framegraph/qdispatchcompute.cpp new file mode 100644 index 000000000..8a9ea3fce --- /dev/null +++ b/src/render/framegraph/qdispatchcompute.cpp @@ -0,0 +1,127 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 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 +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdispatchcompute.h" +#include <Qt3DRender/private/qframegraphnode_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QDispatchComputePrivate : public QFrameGraphNodePrivate +{ +public: + QDispatchComputePrivate() + : QFrameGraphNodePrivate() + , m_workGroupX(1) + , m_workGroupY(1) + , m_workGroupZ(1) + {} + + int m_workGroupX; + int m_workGroupY; + int m_workGroupZ; +}; + +QDispatchCompute::QDispatchCompute(Qt3DCore::QNode *parent) + : QFrameGraphNode(*new QDispatchComputePrivate(), parent) +{ +} + +QDispatchCompute::~QDispatchCompute() +{ + QFrameGraphNode::cleanup(); +} + +int QDispatchCompute::workGroupX() const +{ + Q_D(const QDispatchCompute); + return d->m_workGroupX; +} + +int QDispatchCompute::workGroupY() const +{ + Q_D(const QDispatchCompute); + return d->m_workGroupY; +} + +int QDispatchCompute::workGroupZ() const +{ + Q_D(const QDispatchCompute); + return d->m_workGroupZ; +} + +void QDispatchCompute::setWorkGroupX(int workGroupX) +{ + Q_D(QDispatchCompute); + if (d->m_workGroupX != workGroupX) { + d->m_workGroupX = workGroupX; + emit workGroupXChanged(); + } +} + +void QDispatchCompute::setWorkGroupY(int workGroupY) +{ + Q_D(QDispatchCompute); + if (d->m_workGroupY != workGroupY) { + d->m_workGroupY = workGroupY; + emit workGroupYChanged(); + } +} + +void QDispatchCompute::setWorkGroupZ(int workGroupZ) +{ + Q_D(QDispatchCompute); + if (d->m_workGroupZ != workGroupZ) { + d->m_workGroupZ = workGroupZ; + emit workGroupZChanged(); + } + +} + +void QDispatchCompute::copy(const Qt3DCore::QNode *ref) +{ + QFrameGraphNode::copy(ref); + const QDispatchCompute *dispatch = static_cast<const QDispatchCompute *>(ref); + d_func()->m_workGroupX = dispatch->workGroupX(); + d_func()->m_workGroupY = dispatch->workGroupY(); + d_func()->m_workGroupZ = dispatch->workGroupZ(); +} + +} // Qt3DRender + +QT_END_NAMESPACE + diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h new file mode 100644 index 000000000..dffe8000c --- /dev/null +++ b/src/render/framegraph/qdispatchcompute.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 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 +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DRENDER_QDISPATCHCOMPUTE_H +#define QT3DRENDER_QDISPATCHCOMPUTE_H + +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qframegraphnode.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QDispatchComputePrivate; + +class QT3DRENDERSHARED_EXPORT QDispatchCompute : public QFrameGraphNode +{ + Q_OBJECT + Q_PROPERTY(int workGroupX READ workGroupX WRITE setWorkGroupX NOTIFY workGroupXChanged) + Q_PROPERTY(int workGroupY READ workGroupY WRITE setWorkGroupY NOTIFY workGroupYChanged) + Q_PROPERTY(int workGroupZ READ workGroupZ WRITE setWorkGroupZ NOTIFY workGroupZChanged) +public: + explicit QDispatchCompute(Qt3DCore::QNode *parent = Q_NULLPTR); + ~QDispatchCompute(); + + int workGroupX() const; + int workGroupY() const; + int workGroupZ() const; + + void setWorkGroupX(int workGroupX); + void setWorkGroupY(int workGroupY); + void setWorkGroupZ(int workGroupZ); + +Q_SIGNALS: + void workGroupXChanged(); + void workGroupYChanged(); + void workGroupZChanged(); + + // QNode interface +protected: + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + +private: + QT3D_CLONEABLE(QDispatchCompute) + Q_DECLARE_PRIVATE(QDispatchCompute) +}; + +} // Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QDISPATCHCOMPUTE_H |