aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp6
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer.cpp3
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer.cpp3
-rw-r--r--src/quick/scenegraph/qsgrenderloop.cpp3
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop.cpp6
-rw-r--r--src/quick/scenegraph/qsgwindowsrenderloop.cpp15
-rw-r--r--src/quick/scenegraph/util/qsgatlastexture.cpp3
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp6
8 files changed, 17 insertions, 28 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 297bea6e6a..700ec051ff 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -171,8 +171,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
if (qsg_render_timing)
qDebug(" - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphContextFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphContextFrame, (
qsg_renderer_timer.nsecsElapsed()));
#endif
@@ -208,8 +207,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
if (qsg_render_timing)
qDebug(" - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphContextFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphContextFrame, (
qsg_renderer_timer.nsecsElapsed()));
#endif
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 44b80df15d..047891e17c 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -287,8 +287,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
int(renderTime / 1000000));
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphRendererFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRendererFrame, (
preprocessTime,
updatePassTime - preprocessTime,
bindTime - updatePassTime,
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index 8798208ea3..aa678b34a6 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -196,8 +196,7 @@ void QSGDistanceFieldGlyphCache::update()
(int) qsg_render_timer.elapsed());
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphAdaptationLayerFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphAdaptationLayerFrame, (
count,
renderTime,
qsg_render_timer.nsecsElapsed() - renderTime));
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index facb11d275..5559745621 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -342,8 +342,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
lastFrameTime = QTime::currentTime();
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphRenderLoopFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRenderLoopFrame, (
syncTime,
renderTime,
swapTime));
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 98a88a8540..bc08b70557 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -609,8 +609,7 @@ void QSGRenderThread::syncAndRender()
int((renderTime - syncTime)/1000000),
int(threadTimer.elapsed() - renderTime/1000000));
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphRenderLoopFrame,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRenderLoopFrame, (
syncTime,
renderTime - syncTime,
threadTimer.nsecsElapsed() - renderTime));
@@ -1141,8 +1140,7 @@ void QSGThreadedRenderLoop::polishAndSync(Window *w)
int((syncTime - waitTime)/1000000),
int((timer.nsecsElapsed() - syncTime)/1000000));
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphPolishAndSync,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphPolishAndSync, (
polishTime,
waitTime - polishTime,
syncTime - waitTime,
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index 14569788b0..c3656eac7a 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -202,8 +202,7 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window)
int((time_current - time_created)/1000000),
int((qsg_render_timer.nsecsElapsed() - time_current)/1000000));
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphWindowsRenderShow,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphWindowsRenderShow, (
time_created - time_start,
time_current - time_created,
qsg_render_timer.nsecsElapsed() - time_current));
@@ -405,8 +404,7 @@ void QSGWindowsRenderLoop::render()
qDebug("WindowsRenderLoop: animations=%d ms",
int((qsg_render_timer.nsecsElapsed() - time_start)/1000000));
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphWindowsAnimations,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphWindowsAnimations, (
qsg_render_timer.nsecsElapsed() - time_start));
#endif
@@ -469,12 +467,13 @@ void QSGWindowsRenderLoop::renderWindow(QQuickWindow *window)
int((time_rendered - time_synced)/1000000),
int((time_swapped - time_rendered)/1000000));
}
- Q_QML_PROFILE(sceneGraphFrame(QQmlProfilerService::SceneGraphWindowsPolishFrame,
- time_polished - time_start));
- Q_QML_PROFILE(sceneGraphFrame(QQmlProfilerService::SceneGraphRenderLoopFrame,
+
+ Q_QML_SG_PROFILE2(QQmlProfilerService::SceneGraphWindowsPolishFrame,
+ QQmlProfilerService::SceneGraphRenderLoopFrame, (
time_synced - time_polished,
time_rendered - time_synced,
- time_swapped - time_rendered));
+ time_swapped - time_rendered,
+ time_polished - time_start));
#endif
}
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index 0fce410b62..6e0fdc7290 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -381,8 +381,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering)
(int) (qsg_renderer_timer.elapsed()));
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphTexturePrepare,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTexturePrepare, (
0, // bind (not relevant)
0, // convert (not relevant)
0, // swizzle (not relevant)
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 4243e71844..d84ccb7a1f 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -634,8 +634,7 @@ void QSGPlainTexture::bind()
m_texture_size.width(),
m_texture_size.height());
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphTextureDeletion,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTextureDeletion, (
qsg_renderer_timer.nsecsElapsed()));
#endif
}
@@ -736,8 +735,7 @@ void QSGPlainTexture::bind()
}
- Q_QML_PROFILE(sceneGraphFrame(
- QQmlProfilerService::SceneGraphTexturePrepare,
+ Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTexturePrepare, (
bindTime,
convertTime - bindTime,
swizzleTime - convertTime,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 15:46:35 +0000