diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2017-03-20 11:16:23 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-05 10:04:10 +0000 |
commit | 0b9c8ea524a756d0839575194267c59627ea5419 (patch) | |
tree | 9c2e36049c057dfaf7901f2bf7618dc9f71aed08 /src | |
parent | 01e15dd236b23395139fed61686ea4b98da4ea7d (diff) |
Qt3D: add configure option for jobs and GL profiling
Change-Id: Idb1f54d231e469670b24b2b2aecedbfc1cd0f956
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/aspects/aspectcommanddebugger.cpp | 4 | ||||
-rw-r--r-- | src/core/aspects/aspectcommanddebugger_p.h | 4 | ||||
-rw-r--r-- | src/core/aspects/aspects.pri | 13 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine.cpp | 6 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine_p.h | 1 | ||||
-rw-r--r-- | src/core/configure.json | 24 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob_p.h | 1 | ||||
-rw-r--r-- | src/render/backend/commandexecuter.cpp | 5 | ||||
-rw-r--r-- | src/render/backend/commandexecuter_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/render-backend.pri | 12 | ||||
-rw-r--r-- | src/render/backend/renderer.cpp | 4 |
11 files changed, 51 insertions, 27 deletions
diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp index 0b837052f..eceec1bbd 100644 --- a/src/core/aspects/aspectcommanddebugger.cpp +++ b/src/core/aspects/aspectcommanddebugger.cpp @@ -37,8 +37,6 @@ ** ****************************************************************************/ -#ifdef QT3D_JOBS_RUN_STATS - #include "aspectcommanddebugger_p.h" #include <Qt3DCore/qaspectengine.h> @@ -218,5 +216,3 @@ void AspectCommandDebugger::executeCommand(const QString &command, } // Qt3DCore QT_END_NAMESPACE - -#endif diff --git a/src/core/aspects/aspectcommanddebugger_p.h b/src/core/aspects/aspectcommanddebugger_p.h index b173a5c09..bb6100df5 100644 --- a/src/core/aspects/aspectcommanddebugger_p.h +++ b/src/core/aspects/aspectcommanddebugger_p.h @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#ifdef QT3D_JOBS_RUN_STATS +#include <Qt3DCore/qt3dcore-config.h> #ifndef QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H #define QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H @@ -108,5 +108,3 @@ private: QT_END_NAMESPACE #endif // QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H - -#endif // QT3D_JOBS_RUN_STATS diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri index 773c736a3..54d939138 100644 --- a/src/core/aspects/aspects.pri +++ b/src/core/aspects/aspects.pri @@ -5,8 +5,7 @@ SOURCES += \ $$PWD/qaspectengine.cpp \ $$PWD/qaspectfactory.cpp \ $$PWD/qaspectmanager.cpp \ - $$PWD/qaspectthread.cpp \ - $$PWD/aspectcommanddebugger.cpp + $$PWD/qaspectthread.cpp HEADERS += \ $$PWD/qabstractaspect.h \ @@ -15,7 +14,13 @@ HEADERS += \ $$PWD/qaspectengine_p.h \ $$PWD/qaspectfactory_p.h \ $$PWD/qaspectmanager_p.h \ - $$PWD/qaspectthread_p.h \ - $$PWD/aspectcommanddebugger_p.h + $$PWD/qaspectthread_p.h INCLUDEPATH += $$PWD + +include($$OUT_PWD/../core/qt3dcore-config.pri) +QT_FOR_CONFIG += 3dcore-private +qtConfig(qt3d-profile-jobs): { + HEADERS += $$PWD/aspectcommanddebugger_p.h + SOURCES += $$PWD/aspectcommanddebugger.cpp +} diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index deb6245fd..a3fda90b0 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -49,7 +49,6 @@ #include <Qt3DCore/private/corelogging_p.h> #include <Qt3DCore/private/qaspectthread_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> -#include <Qt3DCore/private/aspectcommanddebugger_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qeventfilterservice_p.h> #include <Qt3DCore/private/qnode_p.h> @@ -58,6 +57,11 @@ #include <Qt3DCore/private/qpostman_p.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qservicelocator_p.h> +#include <Qt3DCore/qt3dcore-config.h> + +#if defined(QT3D_JOBS_RUN_STATS) +#include <Qt3DCore/private/aspectcommanddebugger_p.h> +#endif QT_BEGIN_NAMESPACE diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index c2211dce1..a7311d054 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <Qt3DCore/qt3dcore-config.h> #include <Qt3DCore/qnodecreatedchange.h> #include <QtCore/qsharedpointer.h> diff --git a/src/core/configure.json b/src/core/configure.json index 028f4e0bc..86b31223f 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -4,7 +4,9 @@ "commandline": { "options": { - "assimp": { "type": "enum", "values": [ "qt", "system" ] } + "assimp": { "type": "enum", "values": [ "qt", "system" ] }, + "qt3d-profile-jobs": "boolean", + "qt3d-profile-gl": "boolean" } }, @@ -30,6 +32,22 @@ "disable": "input.assimp == 'qt'", "condition": "features.assimp && libs.assimp", "output": [ "privateFeature" ] + }, + "qt3d-profile-jobs": { + "label": "Output Qt3D Job traces", + "autoDetect": false, + "output": [ + "privateFeature", + { "type": "define", "name": "QT3D_JOBS_RUN_STATS", "value": 1 } + ] + }, + "qt3d-profile-gl": { + "label": "Output Qt3D GL traces", + "autoDetect": false, + "output": [ + "privateFeature", + { "type": "define", "name": "QT3D_OPENGL_RUN_STATS", "value": 1 } + ] } }, @@ -41,7 +59,9 @@ "section": "Qt 3D", "entries": [ "assimp", - "system-assimp" + "system-assimp", + "qt3d-profile-jobs", + "qt3d-profile-gl" ] } ] diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h index fdf39b8b6..6786ccef7 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -54,6 +54,7 @@ #include <QtCore/QWeakPointer> #include <Qt3DCore/private/qt3dcore_global_p.h> +#include <Qt3DCore/qt3dcore-config.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/commandexecuter.cpp b/src/render/backend/commandexecuter.cpp index 2f13b27ea..84bf7455a 100644 --- a/src/render/backend/commandexecuter.cpp +++ b/src/render/backend/commandexecuter.cpp @@ -34,9 +34,8 @@ ** ****************************************************************************/ -#ifdef QT3D_JOBS_RUN_STATS - #include "commandexecuter_p.h" + #include <Qt3DRender/private/renderer_p.h> #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DCore/qbackendnode.h> @@ -388,5 +387,3 @@ QVariant CommandExecuter::executeCommand(const QStringList &args) } // Qt3DRenderer QT_END_NAMESPACE - -#endif diff --git a/src/render/backend/commandexecuter_p.h b/src/render/backend/commandexecuter_p.h index 8135d97d9..896164543 100644 --- a/src/render/backend/commandexecuter_p.h +++ b/src/render/backend/commandexecuter_p.h @@ -48,8 +48,6 @@ // We mean it. // -#ifdef QT3D_JOBS_RUN_STATS - #include <QVector> #include <QVariant> @@ -92,6 +90,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_JOBS_RUN_STATS - #endif // QT3DRENDER_DEBUG_COMMANDEXECUTER_H diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index a7f312eab..5d515a173 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -1,6 +1,3 @@ -#DEFINES += QT3D_RENDER_VIEW_JOB_TIMING -#DEFINES += QT3D_RENDER_DUMP_BACKEND_NODES - INCLUDEPATH += $$PWD HEADERS += \ @@ -38,7 +35,6 @@ HEADERS += \ $$PWD/stringtoint_p.h \ $$PWD/backendnode_p.h \ $$PWD/rendertargetoutput_p.h \ - $$PWD/commandexecuter_p.h \ $$PWD/uniform_p.h \ $$PWD/shaderparameterpack_p.h \ $$PWD/renderviewbuilder_p.h \ @@ -74,7 +70,6 @@ SOURCES += \ $$PWD/backendnode.cpp \ $$PWD/rendertargetoutput.cpp \ $$PWD/attachmentpack.cpp \ - $$PWD/commandexecuter.cpp \ $$PWD/openglvertexarrayobject.cpp \ $$PWD/uniform.cpp \ $$PWD/shaderparameterpack.cpp \ @@ -83,3 +78,10 @@ SOURCES += \ $$PWD/resourceaccessor.cpp \ $$PWD/commandthread.cpp +include($$OUT_PWD/../core/qt3dcore-config.pri) +QT_FOR_CONFIG += 3dcore-private +qtConfig(qt3d-profile-jobs): { + HEADERS += $$PWD/commandexecuter_p.h + SOURCES += $$PWD/commandexecuter.cpp +} + diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 4016f9709..0fda6e5b4 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -88,10 +88,14 @@ #include <Qt3DRender/private/offscreensurfacehelper_p.h> #include <Qt3DRender/qcameralens.h> +#include <Qt3DCore/qt3dcore-config.h> #include <Qt3DCore/private/qeventfilterservice_p.h> #include <Qt3DCore/private/qabstractaspectjobmanager_p.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> + +#if defined(QT3D_JOBS_RUN_STATS) #include <Qt3DCore/private/aspectcommanddebugger_p.h> +#endif #include <QStack> #include <QOffscreenSurface> |