From 9424383e6d0ea1dd02dcf1070259e21550da692a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 24 Jan 2014 13:24:19 +0100 Subject: Move QtQuick profiling to own profiler adapter The QtQuick parts of the QML profiler service thus become a proper global profiler which can be independently enabled and disabled. Change-Id: Ifad03801cab2be66a264fc46fdebdae582fcc99b Reviewed-by: Kai Koehne --- src/quick/scenegraph/qsgwindowsrenderloop.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/quick/scenegraph/qsgwindowsrenderloop.cpp') 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 -#include +#include 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, -- cgit v1.2.3