diff options
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp | 10 | ||||
| -rw-r--r-- | src/qml/debugger/qqmlprofilerdefinitions_p.h | 17 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp index 462401a093..d6cc0f6062 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp @@ -67,6 +67,16 @@ QQmlProfilerServiceImpl::QQmlProfilerServiceImpl(QObject *parent) : addGlobalProfiler(quickAdapter); quickAdapter->setService(this); } + + // try to load QQuick3D profiler adapter if it exists + QQmlAbstractProfilerAdapter *quick3DAdapter = + loadQQmlAbstractProfilerAdapter(QLatin1String("QQuick3DProfilerAdapter")); + if (quick3DAdapter) { + addGlobalProfiler(quick3DAdapter); + quick3DAdapter->setService(this); + } + + } QQmlProfilerServiceImpl::~QQmlProfilerServiceImpl() diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h index 7b972c5d0d..1388c6f38b 100644 --- a/src/qml/debugger/qqmlprofilerdefinitions_p.h +++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h @@ -70,6 +70,7 @@ struct QQmlProfilerDefinitions { SceneGraphFrame, MemoryAllocation, DebugMessage, + Quick3DFrame, MaximumMessage }; @@ -124,6 +125,21 @@ struct QQmlProfilerDefinitions { NumGUIThreadFrameTypes = MaximumSceneGraphFrameType - NumRenderThreadFrameTypes }; + enum Quick3DFrameType { + Quick3DRenderFrame, // Render Thread + Quick3DSynchronizeFrame, + Quick3DPrepareFrame, + Quick3DMeshLoad, + Quick3DCustomMeshLoad, + Quick3DTextureLoad, + Quick3DGenerateShader, + Quick3DLoadShader, + Quick3DParticleUpdate, // GUI Thread + MaximumQuick3DFrameType, + NumQuick3DRenderThreadFrameTypes = Quick3DParticleUpdate, + NumQuick3DGUIThreadFrameTypes = MaximumQuick3DFrameType - NumQuick3DRenderThreadFrameTypes, + }; + enum ProfileFeature { ProfileJavaScript, ProfileMemory, @@ -137,6 +153,7 @@ struct QQmlProfilerDefinitions { ProfileHandlingSignal, ProfileInputEvents, ProfileDebugMessages, + ProfileQuick3D, MaximumProfileFeature }; |