diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-01-24 13:24:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-15 22:37:38 +0100 |
| commit | 9424383e6d0ea1dd02dcf1070259e21550da692a (patch) | |
| tree | f7a9b1372a0a97f997d6a237e3a89e009b07b30e /src/quick/scenegraph/util/qsgtexture.cpp | |
| parent | ab6b6b7c7ab544d347d59b7eefad403837d94012 (diff) | |
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 <kai.koehne@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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, |