aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/debugger
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-06-17 16:27:12 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-06-18 12:18:53 +0200
commit58ed7422f550d32b5ace9edc7a4887727f53493a (patch)
tree02d92822097b91b4c8d1105d046838ff11d54a86 /tests/auto/qml/debugger
parentf4b1e41748adcb9189edf56545bbc2cde7138d9e (diff)
Remove broken profiler/trace points in the scenegraph
As the todo note says: this profiling is all wrong Not reporting something is better than reporting something bogus. The other profiling points, f.ex. in the render loops, seem to work as expected and give reasonable results in the QML Profiler view in Creator. The autotest needs fixing because there is no SGContextFrame events left with the rhi code path either atm, just like with the software backend. Change-Id: Iee2d3feb586108db50c83c6c03ea415384561ede Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger')
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp33
1 files changed, 1 insertions, 32 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index c2a774b42d..e7d6664136 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -604,52 +604,21 @@ void tst_QQmlProfilerService::scenegraphData()
checkJsHeap();
// Check that at least one frame was rendered.
- // There should be a SGContextFrame + SGRendererFrame + SGRenderLoopFrame sequence,
+ // There should be at least a SGRendererFrame + SGRenderLoopFrame sequence,
// but we can't be sure to get the SGRenderLoopFrame in the threaded renderer.
//
// Since the rendering happens in a different thread, there could be other unrelated events
// interleaved. Also, events could carry the same time stamps and be sorted in an unexpected way
// if the clocks are acting up.
- qint64 contextFrameTime = -1;
qint64 renderFrameTime = -1;
-#if QT_CONFIG(opengl) //Software renderer doesn't have context frames
- if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) {
- foreach (const QQmlProfilerEvent &msg, m_client->asynchronousMessages) {
- const QQmlProfilerEventType &type = m_client->types.at(msg.typeIndex());
- if (type.message() == SceneGraphFrame) {
- if (type.detailType() == SceneGraphContextFrame) {
- contextFrameTime = msg.timestamp();
- break;
- }
- }
- }
-
- QVERIFY(contextFrameTime != -1);
- }
-#endif
foreach (const QQmlProfilerEvent &msg, m_client->asynchronousMessages) {
const QQmlProfilerEventType &type = m_client->types.at(msg.typeIndex());
if (type.detailType() == SceneGraphRendererFrame) {
- QVERIFY(msg.timestamp() >= contextFrameTime);
renderFrameTime = msg.timestamp();
break;
}
}
-
QVERIFY(renderFrameTime != -1);
-
- foreach (const QQmlProfilerEvent &msg, m_client->asynchronousMessages) {
- const QQmlProfilerEventType &type = m_client->types.at(msg.typeIndex());
- if (type.detailType() == SceneGraphRenderLoopFrame) {
- if (msg.timestamp() >= contextFrameTime) {
- // Make sure SceneGraphRenderLoopFrame is not between SceneGraphContextFrame and
- // SceneGraphRendererFrame. A SceneGraphRenderLoopFrame before everything else is
- // OK as the scene graph might decide to do an initial rendering.
- QVERIFY(msg.timestamp() >= renderFrameTime);
- break;
- }
- }
- }
}
void tst_QQmlProfilerService::profileOnExit()