diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-06-30 14:01:38 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@digia.com> | 2014-07-02 10:41:14 +0200 |
| commit | 5f24d63d89009a91035f586a1d80fa61fcd2d681 (patch) | |
| tree | 660dd93e612bf640885d97ad99783dc6c5a06926 /src/quick/scenegraph/util | |
| parent | 708f5bdb2fb8aff65774d5c23933636f549bc316 (diff) | |
Properly collect polish timings from all render loops
Previously the polish timings were collected incorrectly from the
windows render loop and not at all from the basic render loop. By
collecting the polish times at the right places we can get rid of
the 2-argument profile macro as well.
Task-number: QTBUG-39876
Change-Id: I0b4aaf87162c652b8dcea6cd4f54db053f8312fe
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index fcd10ee577..f7cf97954a 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -399,7 +399,7 @@ void Atlas::bind(QSGTexture::Filtering filtering) << "ms (" << m_pending_uploads.at(i)->image().width() << "x" << m_pending_uploads.at(i)->image().height() << ")"; - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, ( + Q_QUICK_SG_PROFILE(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 995bfc183a..120a3ebf3d 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -625,7 +625,7 @@ void QSGPlainTexture::bind() (int) qsg_renderer_timer.elapsed(), m_texture_size.width(), m_texture_size.height()); - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTextureDeletion, ( + Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphTextureDeletion, ( qsg_renderer_timer.nsecsElapsed())); } m_texture_id = 0; @@ -726,7 +726,7 @@ void QSGPlainTexture::bind() int((mipmapTime - uploadTime)/1000000)); } - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, ( + Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphTexturePrepare, ( bindTime, convertTime - bindTime, swizzleTime - convertTime, |