summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2018-11-19 21:29:37 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-12-04 13:20:40 +0000
commit437c95b5f50b6a433587c1cfb93ecab6b62c7725 (patch)
treef9333ab74122e8ca097ebd99ab9afe55b964af65
parente4161db48c76fe646a338315c0c1a1f3588edbb4 (diff)
Dragon: Remove debug output and add message when Dragon is enabled
Change-Id: Ifa546ed6c46102a5c8a76d85ac6a6399a49b54a5 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtime/dragon/dragongraphicsutils_p.h1
-rw-r--r--src/runtime/dragon/dragonmutable_p.h1
-rw-r--r--src/runtime/dragon/dragonoffscreensurfacehelper.cpp3
-rw-r--r--src/runtime/dragon/dragontask_p.h1
-rw-r--r--src/runtime/dragon/geometry/dragonattribute.cpp1
-rw-r--r--src/runtime/dragon/materialsystem/dragontechnique.cpp1
-rw-r--r--src/runtime/dragon/qdragonrenderaspect.cpp2
-rw-r--r--src/runtime/dragon/renderer/dragonuniform_p.h1
-rw-r--r--src/runtime/dragon/renderstates/dragonrenderstateset.cpp1
9 files changed, 2 insertions, 10 deletions
diff --git a/src/runtime/dragon/dragongraphicsutils_p.h b/src/runtime/dragon/dragongraphicsutils_p.h
index 444a924..dd26d5f 100644
--- a/src/runtime/dragon/dragongraphicsutils_p.h
+++ b/src/runtime/dragon/dragongraphicsutils_p.h
@@ -111,7 +111,6 @@ public:
}
case QMetaType::UInt: {
- qDebug() << "UINT";
T data = v.value<uint>();
memcpy(array.data(), &data, byteSize);
break;
diff --git a/src/runtime/dragon/dragonmutable_p.h b/src/runtime/dragon/dragonmutable_p.h
index 6d18b8c..15f606f 100644
--- a/src/runtime/dragon/dragonmutable_p.h
+++ b/src/runtime/dragon/dragonmutable_p.h
@@ -45,7 +45,6 @@
#include <sstream>
#include <memory>
#include <type_traits>
-#include <QDebug>
QT_BEGIN_NAMESPACE
diff --git a/src/runtime/dragon/dragonoffscreensurfacehelper.cpp b/src/runtime/dragon/dragonoffscreensurfacehelper.cpp
index 9bdcc6c..cbcae62 100644
--- a/src/runtime/dragon/dragonoffscreensurfacehelper.cpp
+++ b/src/runtime/dragon/dragonoffscreensurfacehelper.cpp
@@ -32,8 +32,6 @@
#include <private/dragonrenderer_p.h>
-#include <QDebug>
-
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
@@ -48,7 +46,6 @@ OffscreenSurfaceHelper::OffscreenSurfaceHelper(Renderer *renderer, QObject *pare
void OffscreenSurfaceHelper::createOffscreenSurface()
{
- qDebug() << "CREATE OFFSCREEN";
m_offscreenSurface = new QOffscreenSurface;
m_offscreenSurface->setParent(this);
m_offscreenSurface->setFormat(m_renderer->openGLContext()->format());
diff --git a/src/runtime/dragon/dragontask_p.h b/src/runtime/dragon/dragontask_p.h
index d49fc02..35c38e4 100644
--- a/src/runtime/dragon/dragontask_p.h
+++ b/src/runtime/dragon/dragontask_p.h
@@ -42,7 +42,6 @@
// We mean it.
//
-#include <QDebug>
#include <QSharedPointer>
#include <Qt3DCore/QAspectJob>
#include <functional>
diff --git a/src/runtime/dragon/geometry/dragonattribute.cpp b/src/runtime/dragon/geometry/dragonattribute.cpp
index a0e9163..e801866 100644
--- a/src/runtime/dragon/geometry/dragonattribute.cpp
+++ b/src/runtime/dragon/geometry/dragonattribute.cpp
@@ -96,7 +96,6 @@ void Attribute::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch
void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
-// qDebug() << "CHANGE!";
switch (e->type()) {
case PropertyUpdated: {
QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e);
diff --git a/src/runtime/dragon/materialsystem/dragontechnique.cpp b/src/runtime/dragon/materialsystem/dragontechnique.cpp
index a29516d..aa77212 100644
--- a/src/runtime/dragon/materialsystem/dragontechnique.cpp
+++ b/src/runtime/dragon/materialsystem/dragontechnique.cpp
@@ -196,7 +196,6 @@ GraphicsApiFilterData Technique::graphicsApiFilter() const
void Technique::appendFilterKey(Qt3DCore::QNodeId criterionId)
{
- qDebug() << "APPENDED FILTER KEY";
if (!m_filterKeyList.contains(criterionId))
m_filterKeyList.append(criterionId);
}
diff --git a/src/runtime/dragon/qdragonrenderaspect.cpp b/src/runtime/dragon/qdragonrenderaspect.cpp
index f82c1f5..4296d98 100644
--- a/src/runtime/dragon/qdragonrenderaspect.cpp
+++ b/src/runtime/dragon/qdragonrenderaspect.cpp
@@ -190,6 +190,8 @@ namespace Dragon {
QDragonRenderAspect::QDragonRenderAspect(Renderer::RenderType renderType)
: m_renderer(new Renderer(renderType))
{
+ qDebug() << "Dragon render aspect enabled";
+
registerBackendType<Qt3DCore::QEntity>(m_entities);
registerBackendType<Qt3DCore::QTransform>(m_transforms);
registerBackendType<QAbstractTexture>(m_textures);
diff --git a/src/runtime/dragon/renderer/dragonuniform_p.h b/src/runtime/dragon/renderer/dragonuniform_p.h
index f2f80d2..8c7ed9c 100644
--- a/src/runtime/dragon/renderer/dragonuniform_p.h
+++ b/src/runtime/dragon/renderer/dragonuniform_p.h
@@ -53,7 +53,6 @@
#include <QVector3D>
#include <QColor>
-#include <QDebug>
#include <string.h>
QT_BEGIN_NAMESPACE
diff --git a/src/runtime/dragon/renderstates/dragonrenderstateset.cpp b/src/runtime/dragon/renderstates/dragonrenderstateset.cpp
index 92a210d..f2af518 100644
--- a/src/runtime/dragon/renderstates/dragonrenderstateset.cpp
+++ b/src/runtime/dragon/renderstates/dragonrenderstateset.cpp
@@ -32,7 +32,6 @@
#include <bitset>
-#include <QDebug>
#include <QOpenGLContext>
QT_BEGIN_NAMESPACE