diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-25 15:09:03 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-02-26 09:45:12 +0000 |
commit | 7e2f9d42eebe13182918d832577c4f5ed96ab87b (patch) | |
tree | cee2c929e6a1fe365d3a290067fe0ab935069162 /src/render/materialsystem/qparametermapping_p.h | |
parent | 473fb46f44d4225675c5d903501a7cb9ee6b8258 (diff) |
Remove ParameterMapping
* Bindings are now entirely deduced from shader introspection
* Modified the BackendNodeDirtyFlags to remove the class at this
prevents the operator~() to be called
* Make the Renderer loop check for the ComputeDirty flag and
don't unset it if set
Note: uses a hack to reset m_changeSet in performCompute as right know
we are sometimes missing the markDirty(ComputeDirty) set by the ComputeJob nodes.
Will be sorted out later.
Change-Id: Ic4fa71ecf01b625e885a58a66278387bf5b36339
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qparametermapping_p.h')
-rw-r--r-- | src/render/materialsystem/qparametermapping_p.h | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h deleted file mode 100644 index 2fee05639..000000000 --- a/src/render/materialsystem/qparametermapping_p.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D 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 QT3DRENDER_QPARAMETERMAPPING_P_H -#define QT3DRENDER_QPARAMETERMAPPING_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <private/qnode_p.h> -#include <Qt3DRender/QParameterMapping> - -QT_BEGIN_NAMESPACE - -namespace Qt3DRender { - -class QParameterMappingPrivate : public Qt3DCore::QNodePrivate -{ -public: - QParameterMappingPrivate(); - - Q_DECLARE_PUBLIC(QParameterMapping) - - QString m_parameterName; - QString m_shaderVariableName; - QParameterMapping::Binding m_bindingType; -}; - -} // namespace Qt3DRender - -QT_END_NAMESPACE - -#endif // QT3DRENDER_QPARAMETERMAPPING_P_H |