Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 6 insertions, 0 deletions

diff --git a/src/quick/scenegraph/util/qsgrhiatlastexture.cpp b/src/quick/scenegraph/util/qsgrhiatlastexture.cpp
index 3dc1f5f526..6b5f1aec4f 100644
--- a/src/quick/scenegraph/util/qsgrhiatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgrhiatlastexture.cpp
@@ -49,6 +49,9 @@
 #include <private/qquickprofiler_p.h>
 #include <private/qsgdefaultrendercontext_p.h>
 #include <private/qsgtexture_p.h>
+
+#include <qtquick_tracepoints_p.h>
+
 #if 0
 #include <private/qsgcompressedtexture_p.h>
 #include <private/qsgcompressedatlastexture_p.h>
@@ -197,14 +200,17 @@ void AtlasBase::updateRhiTexture(QRhiResourceUpdateBatch *resourceUpdates)
         if (profileFrames)
             qsg_renderer_timer.start();
 
+        Q_TRACE_SCOPE(QSG_texture_prepare);
         Q_QUICK_SG_PROFILE_START(QQuickProfiler::SceneGraphTexturePrepare);
 
         // Skip bind, convert, swizzle; they're irrelevant
         Q_QUICK_SG_PROFILE_SKIP(QQuickProfiler::SceneGraphTexturePrepare,
                                 QQuickProfiler::SceneGraphTexturePrepareStart, 3);
+        Q_TRACE(QSG_texture_upload_entry);
 
         enqueueTextureUpload(t, resourceUpdates);
 
+        Q_TRACE(QSG_texture_upload_exit);
         Q_QUICK_SG_PROFILE_RECORD(QQuickProfiler::SceneGraphTexturePrepare,
                                   QQuickProfiler::SceneGraphTexturePrepareUpload);