From 5f24d63d89009a91035f586a1d80fa61fcd2d681 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 30 Jun 2014 14:01:38 +0200 Subject: 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 --- src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 4 ++-- src/quick/scenegraph/coreapi/qsgrenderer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/scenegraph/coreapi') diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index c064023010..3770461ba7 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -162,7 +162,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material) qCDebug(QSG_LOG_TIME_COMPILATION, "shader compiled in %dms", (int) qsg_renderer_timer.elapsed()); - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphContextFrame, ( + Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphContextFrame, ( qsg_renderer_timer.nsecsElapsed())); rewrittenShaders[type] = shader; @@ -193,7 +193,7 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate qCDebug(QSG_LOG_TIME_COMPILATION, "shader compiled in %dms (no rewrite)", (int) qsg_renderer_timer.elapsed()); - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphContextFrame, ( + Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphContextFrame, ( qsg_renderer_timer.nsecsElapsed())); return shader; } diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp index d64bd4e14a..2980cea7b2 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp @@ -276,7 +276,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable) int((bindTime - updatePassTime) / 1000000), int((renderTime - bindTime) / 1000000)); - Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphRendererFrame, ( + Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphRendererFrame, ( preprocessTime, updatePassTime - preprocessTime, bindTime - updatePassTime, -- cgit v1.2.3