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.cpp11
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer.cpp8
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer.cpp6
-rw-r--r--src/quick/scenegraph/qsgrenderloop.cpp6
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop.cpp10
-rw-r--r--src/quick/scenegraph/qsgwindowsrenderloop.cpp12
-rw-r--r--src/quick/scenegraph/util/qsgatlastexture.cpp6
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp8
8 files changed, 34 insertions, 33 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 8dfa0d2c2c..f121e16523 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -48,12 +48,13 @@
#include <qmath.h>
#include <QtCore/QElapsedTimer>
+#include <QtCore/QtNumeric>
#include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLVertexArrayObject>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
#include <algorithm>
@@ -133,7 +134,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
return shader;
#ifndef QSG_NO_RENDER_TIMING
- if (qsg_render_timing || QQmlProfilerService::enabled)
+ if (qsg_render_timing || QQuickProfiler::enabled)
qsg_renderer_timer.start();
#endif
@@ -176,7 +177,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
if (qsg_render_timing)
qDebug(" - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphContextFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphContextFrame, (
qsg_renderer_timer.nsecsElapsed()));
#endif
@@ -192,7 +193,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
return shader;
#ifndef QSG_NO_RENDER_TIMING
- if (qsg_render_timing || QQmlProfilerService::enabled)
+ if (qsg_render_timing || QQuickProfiler::enabled)
qsg_renderer_timer.start();
#endif
@@ -212,7 +213,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
if (qsg_render_timing)
qDebug(" - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphContextFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphContextFrame, (
qsg_renderer_timer.nsecsElapsed()));
#endif
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 047891e17c..cc8793c0cf 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -54,7 +54,7 @@
#include <qdatetime.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
QT_BEGIN_NAMESPACE
@@ -227,7 +227,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
frameTimer.start();
qint64 bindTime = 0;
@@ -287,7 +287,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
int(renderTime / 1000000));
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRendererFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphRendererFrame, (
preprocessTime,
updatePassTime - preprocessTime,
bindTime - updatePassTime,
@@ -375,7 +375,7 @@ void QSGRenderer::preprocess()
}
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
preprocessTime = frameTimer.nsecsElapsed();
#endif
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index aa678b34a6..17f4ba1243 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -48,7 +48,7 @@
#include <QtGui/qguiapplication.h>
#include <qdir.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
#include <QElapsedTimer>
QT_BEGIN_NAMESPACE
@@ -164,7 +164,7 @@ void QSGDistanceFieldGlyphCache::update()
return;
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
qsg_render_timer.start();
#endif
@@ -196,7 +196,7 @@ void QSGDistanceFieldGlyphCache::update()
(int) qsg_render_timer.elapsed());
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphAdaptationLayerFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphAdaptationLayerFrame, (
count,
renderTime,
qsg_render_timer.nsecsElapsed() - renderTime));
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 7b6e6d55ee..4e8fa67869 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -57,7 +57,7 @@
#include <QtQuick/QQuickWindow>
#include <QtQuick/private/qquickwindow_p.h>
#include <QtQuick/private/qsgcontext_p.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
QT_BEGIN_NAMESPACE
@@ -304,7 +304,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
qint64 renderTime = 0, syncTime = 0;
QElapsedTimer renderTimer;
- bool profileFrames = qsg_render_timing() || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing() || QQuickProfiler::enabled;
if (profileFrames)
renderTimer.start();
@@ -343,7 +343,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
lastFrameTime = QTime::currentTime();
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRenderLoopFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphRenderLoopFrame, (
syncTime,
renderTime,
swapTime));
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 7cc4293f6c..ffc6d31aa7 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -58,7 +58,7 @@
#include "qsgthreadedrenderloop_p.h"
#include <private/qquickanimatorcontroller_p.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
/*
Overall design:
@@ -539,7 +539,7 @@ void QSGRenderThread::sync()
void QSGRenderThread::syncAndRender()
{
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames) {
sinceLastTime = threadTimer.nsecsElapsed();
threadTimer.start();
@@ -609,7 +609,7 @@ void QSGRenderThread::syncAndRender()
int((renderTime - syncTime)/1000000),
int(threadTimer.elapsed() - renderTime/1000000));
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphRenderLoopFrame, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphRenderLoopFrame, (
syncTime,
renderTime - syncTime,
threadTimer.nsecsElapsed() - renderTime));
@@ -1081,7 +1081,7 @@ void QSGThreadedRenderLoop::polishAndSync(Window *w)
qint64 polishTime = 0;
qint64 waitTime = 0;
qint64 syncTime = 0;
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
timer.start();
#endif
@@ -1140,7 +1140,7 @@ void QSGThreadedRenderLoop::polishAndSync(Window *w)
int((syncTime - waitTime)/1000000),
int((timer.nsecsElapsed() - syncTime)/1000000));
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphPolishAndSync, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphPolishAndSync, (
polishTime,
waitTime - polishTime,
syncTime - waitTime,
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index 63e3e958f6..995d80bb82 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -51,7 +51,7 @@
#include <QtQuick/QQuickWindow>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
QT_BEGIN_NAMESPACE
@@ -69,7 +69,7 @@ static QElapsedTimer qsg_debug_timer;
#ifndef QSG_NO_RENDER_TIMING
static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
static QElapsedTimer qsg_render_timer;
-#define QSG_RENDER_TIMING_SAMPLE(sampleName) qint64 sampleName = 0; if (qsg_render_timing || QQmlProfilerService::enabled) sampleName = qsg_render_timer.nsecsElapsed()
+#define QSG_RENDER_TIMING_SAMPLE(sampleName) qint64 sampleName = 0; if (qsg_render_timing || QQuickProfiler::enabled) sampleName = qsg_render_timer.nsecsElapsed()
#else
#define QSG_RENDER_TIMING_SAMPLE(sampleName)
#endif
@@ -202,7 +202,7 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window)
int((time_current - time_created)/1000000),
int((qsg_render_timer.nsecsElapsed() - time_current)/1000000));
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphWindowsRenderShow, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphWindowsRenderShow, (
time_created - time_start,
time_current - time_created,
qsg_render_timer.nsecsElapsed() - time_current));
@@ -404,7 +404,7 @@ void QSGWindowsRenderLoop::render()
qDebug("WindowsRenderLoop: animations=%d ms",
int((qsg_render_timer.nsecsElapsed() - time_start)/1000000));
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphWindowsAnimations, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphWindowsAnimations, (
qsg_render_timer.nsecsElapsed() - time_start));
#endif
@@ -468,8 +468,8 @@ void QSGWindowsRenderLoop::renderWindow(QQuickWindow *window)
int((time_swapped - time_rendered)/1000000));
}
- Q_QML_SG_PROFILE2(QQmlProfilerService::SceneGraphWindowsPolishFrame,
- QQmlProfilerService::SceneGraphRenderLoopFrame, (
+ Q_QUICK_SG_PROFILE2(QQuickProfiler::SceneGraphWindowsPolishFrame,
+ QQuickProfiler::SceneGraphRenderLoopFrame, (
time_synced - time_polished,
time_rendered - time_synced,
time_swapped - time_rendered,
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index e39949253f..fe659c9add 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -52,7 +52,7 @@
#include <private/qsgtexture_p.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
QT_BEGIN_NAMESPACE
@@ -374,7 +374,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering)
for (int i=0; i<m_pending_uploads.size(); ++i) {
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
qsg_renderer_timer.start();
#endif
@@ -394,7 +394,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering)
(int) (qsg_renderer_timer.elapsed()));
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTexturePrepare, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::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 9620e48588..3bbcb0c112 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -45,7 +45,7 @@
#include <qopenglfunctions.h>
#include <QtQuick/private/qsgcontext_p.h>
#include <qthread.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qquickprofiler_p.h>
#include <private/qqmlglobal_p.h>
#include <QtGui/qguiapplication.h>
#include <QtGui/qpa/qplatformnativeinterface.h>
@@ -613,7 +613,7 @@ void QSGPlainTexture::bind()
m_dirty_texture = false;
#ifndef QSG_NO_RENDER_TIMING
- bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
+ bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
if (profileFrames)
qsg_renderer_timer.start();
#endif
@@ -628,7 +628,7 @@ void QSGPlainTexture::bind()
m_texture_size.width(),
m_texture_size.height());
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTextureDeletion, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTextureDeletion, (
qsg_renderer_timer.nsecsElapsed()));
#endif
}
@@ -738,7 +738,7 @@ void QSGPlainTexture::bind()
}
- Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTexturePrepare, (
+ Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, (
bindTime,
convertTime - bindTime,
swizzleTime - convertTime,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 22:40:30 +0000