summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-08-12 11:06:35 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-08-13 12:51:43 +0200
commitb3074aeec2ab64fb852ab9db1b9452fa7406dde0 (patch)
tree273ff458281237a18c5db80ddceab41e14e0456b /src/quick3d/quick3drender/items
parent0057d782bf512e25b4f6298218577573d9f29f87 (diff)
QRenderTargetSelector: remove outputs/drawBuffers property
This cannot be handled with RHI and in practice nobody ever used that feature. [ChangeLog] QRenderTargetSelector remove outputs/drawBuffers property Change-Id: I6b02718733e5c05cee9074b0078ba2a544de95d6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/items.pri2
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetselector.cpp87
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetselector_p.h90
3 files changed, 0 insertions, 179 deletions
diff --git a/src/quick3d/quick3drender/items/items.pri b/src/quick3d/quick3drender/items/items.pri
index 4bfb1ae4a..06732cf33 100644
--- a/src/quick3d/quick3drender/items/items.pri
+++ b/src/quick3d/quick3drender/items/items.pri
@@ -5,7 +5,6 @@ HEADERS += \
$$PWD/quick3dmaterial_p.h \
$$PWD/quick3drenderpass_p.h \
$$PWD/quick3drenderpassfilter_p.h \
- $$PWD/quick3drendertargetselector_p.h \
$$PWD/quick3dscene_p.h \
$$PWD/quick3dshaderdata_p.h \
$$PWD/quick3dshaderdataarray_p.h \
@@ -37,7 +36,6 @@ SOURCES += \
$$PWD/quick3dshaderdata.cpp \
$$PWD/quick3dshaderdataarray.cpp \
$$PWD/quick3dstateset.cpp \
- $$PWD/quick3drendertargetselector.cpp \
$$PWD/quick3drendertargetoutput.cpp \
$$PWD/quick3dmemorybarrier.cpp \
$$PWD/quick3draycaster.cpp \
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
deleted file mode 100644
index ce9ebd976..000000000
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 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$
-**
-****************************************************************************/
-
-#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-namespace Render {
-namespace Quick {
-
-Quick3DRenderTargetSelector::Quick3DRenderTargetSelector(QObject *parent)
- : QObject(parent)
-{
-}
-
-Quick3DRenderTargetSelector::~Quick3DRenderTargetSelector()
-{
-}
-
-QVariantList Quick3DRenderTargetSelector::drawBuffers() const
-{
- // Converts RenderAttachmentType to int
- QVariantList l;
- const auto outputs = parentRenderTargetSelector()->outputs();
- l.reserve(outputs.size());
- for (const QRenderTargetOutput::AttachmentPoint &b : outputs)
- l.append(static_cast<int>(b));
- return l;
-}
-
-void Quick3DRenderTargetSelector::setDrawBuffers(const QVariantList &buffers)
-{
- if (buffers != drawBuffers()) {
-
- // Converts int to RenderAttachmentType
- QList<QRenderTargetOutput::AttachmentPoint> drawBuffersList;
- drawBuffersList.reserve(buffers.size());
- for (const QVariant &buf : buffers)
- drawBuffersList.append(static_cast<QRenderTargetOutput::AttachmentPoint>(buf.toInt()));
-
- parentRenderTargetSelector()->setOutputs(drawBuffersList);
- emit drawBuffersChanged();
- }
-}
-
-} // namespace Quick
-} // namespace Render
-} // namespace Qt3DRender
-
-QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
deleted file mode 100644
index 7f4b99749..000000000
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 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_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_P_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_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 <Qt3DRender/qrendertargetoutput.h>
-#include <Qt3DRender/qrendertargetselector.h>
-#include <QtCore/QVariantList>
-#include <QtQml/QQmlListProperty>
-
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-namespace Render {
-namespace Quick {
-
-class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged)
-public:
- explicit Quick3DRenderTargetSelector(QObject *parent = 0);
- ~Quick3DRenderTargetSelector();
-
- inline QRenderTargetSelector *parentRenderTargetSelector() const { return qobject_cast<QRenderTargetSelector *>(parent()); }
-
- QVariantList drawBuffers() const;
- void setDrawBuffers(const QVariantList &drawBuffers);
-
-Q_SIGNALS:
- void drawBuffersChanged();
-};
-
-} // namespace Quick
-} // namespace Render
-} // namespace Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_P_H