Our debug env vars are a mess. Standardize on QSG_RENDER_TIMING

Change-Id: I4e88b479a8a9a5126312a05800e8170511b1f7ac
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 45a0b4b..b46d45b 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE
 
 
 
-#ifndef QSG_NO_RENDERER_TIMING
-static bool qsg_render_timing = !qgetenv("QML_RENDERER_TIMING").isEmpty();
+#ifndef QSG_NO_RENDER_TIMING
+static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
 static QTime frameTimer;
 static int preprocessTime;
 static int updatePassTime;
@@ -237,7 +237,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
     m_is_rendering = true;
 
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         frameTimer.start();
     int bindTime = 0;
@@ -248,7 +248,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
     preprocess();
 
     bindable.bind();
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         bindTime = frameTimer.elapsed();
 #endif
@@ -269,7 +269,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
 #endif
 
     render();
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         renderTime = frameTimer.elapsed();
 #endif
@@ -289,7 +289,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
         m_index_buffer_bound = false;
     }
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing) {
         printf(" - Breakdown of render time: preprocess=%d, updates=%d, binding=%d, render=%d, total=%d\n",
                preprocessTime,
@@ -379,7 +379,7 @@ void QSGRenderer::preprocess()
         }
     }
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         preprocessTime = frameTimer.elapsed();
 #endif
@@ -387,7 +387,7 @@ void QSGRenderer::preprocess()
     nodeUpdater()->setToplevelOpacity(context()->renderAlpha());
     nodeUpdater()->updateStates(m_root_node);
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         updatePassTime = frameTimer.elapsed();
 #endif

diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index 4e8bafb..1d534e3 100644 (file)
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -52,8 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QSG_NO_RENDERER_TIMING
-static bool qsg_render_timing = !qgetenv("QML_RENDERER_TIMING").isEmpty();
+#ifndef QSG_NO_RENDER_TIMING
+static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
 static QElapsedTimer qsg_render_timer;
 #endif
 
@@ -161,7 +161,7 @@ void QSGDistanceFieldGlyphCache::update()
     if (m_pendingGlyphs.isEmpty())
         return;
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         qsg_render_timer.start();
 #endif
@@ -175,7 +175,7 @@ void QSGDistanceFieldGlyphCache::update()
         distanceFields.insert(glyphIndex, distanceField);
     }
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int renderTime = 0;
     int count = m_pendingGlyphs.size();
     if (qsg_render_timing)
@@ -186,7 +186,7 @@ void QSGDistanceFieldGlyphCache::update()
 
     storeGlyphs(distanceFields);
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing) {
         printf("   - glyphs: count=%d, render=%d, store=%d, total=%d\n",
                count,

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 705b12c..8d36fce 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -72,8 +72,8 @@ DEFINE_BOOL_CONFIG_OPTION(qmlTranslucentMode, QML_TRANSLUCENT_MODE)
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
 
-#ifndef QSG_NO_RENDERER_TIMING
-static bool qsg_render_timing = !qgetenv("QML_RENDERER_TIMING").isEmpty();
+#ifndef QSG_NO_RENDER_TIMING
+static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
 static QElapsedTimer qsg_renderer_timer;
 #endif
 
@@ -477,7 +477,7 @@ QSGMaterialShader *QSGContext::prepareMaterial(QSGMaterial *material)
     if (shader)
         return shader;
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         qsg_renderer_timer.start();
 #endif
@@ -487,7 +487,7 @@ QSGMaterialShader *QSGContext::prepareMaterial(QSGMaterial *material)
     shader->initialize();
     d->materials[type] = shader;
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         printf("   - compiling material: %dms\n", (int) qsg_renderer_timer.elapsed());
 #endif

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index a55658b..16af79e 100644 (file)
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-DEFINE_BOOL_CONFIG_OPTION(qquick_render_timing, QML_RENDER_TIMING)
+DEFINE_BOOL_CONFIG_OPTION(qsg_render_timing, QSG_RENDER_TIMING)
 
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
 
@@ -272,17 +272,17 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
 
     int renderTime = 0, syncTime = 0;
     QTime renderTimer;
-    if (qquick_render_timing())
+    if (qsg_render_timing())
         renderTimer.start();
 
     cd->syncSceneGraph();
 
-    if (qquick_render_timing())
+    if (qsg_render_timing())
         syncTime = renderTimer.elapsed();
 
     cd->renderSceneGraph(window->size());
 
-    if (qquick_render_timing())
+    if (qsg_render_timing())
         renderTime = renderTimer.elapsed() - syncTime;
 
     if (data.grabOnly) {
@@ -295,7 +295,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         cd->fireFrameSwapped();
     }
 
-    if (qquick_render_timing()) {
+    if (qsg_render_timing()) {
         static QTime lastFrameTime = QTime::currentTime();
         const int swapTime = renderTimer.elapsed() - renderTime - syncTime;
         qDebug() << "- Breakdown of frame time; sync:" << syncTime

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index ef50d5a..637e91d 100644 (file)
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -136,8 +136,8 @@ static inline int qsgrl_animation_interval() {
 }
 
 
-#ifndef QSG_NO_WINDOW_TIMING
-static bool qquick_window_timing = !qgetenv("QML_WINDOW_TIMING").isEmpty();
+#ifndef QSG_NO_RENDER_TIMING
+static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
 static QTime threadTimer;
 static int syncTime;
 static int renderTime;
@@ -563,8 +563,8 @@ void QSGRenderThread::sync()
 
 void QSGRenderThread::syncAndRender()
 {
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         sinceLastTime = threadTimer.restart();
 #endif
     QElapsedTimer waitTimer;
@@ -589,8 +589,8 @@ void QSGRenderThread::syncAndRender()
         return;
     }
 
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         syncTime = threadTimer.elapsed();
 #endif
     RLDEBUG("    Render:  - rendering starting");
@@ -604,8 +604,8 @@ void QSGRenderThread::syncAndRender()
         }
         gl->makeCurrent(w.window);
         d->renderSceneGraph(w.size);
-#ifndef QSG_NO_WINDOW_TIMING
-        if (qquick_window_timing && i == 0)
+#ifndef QSG_NO_RENDER_TIMING
+        if (qsg_render_timing && i == 0)
             renderTime = threadTimer.elapsed();
 #endif
         gl->swapBuffers(w.window);
@@ -613,8 +613,8 @@ void QSGRenderThread::syncAndRender()
     }
     RLDEBUG("    Render:  - rendering done");
 
-#ifndef QSG_NO_WINDOW_TIMING
-        if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+        if (qsg_render_timing)
             qDebug("window Time: sinceLast=%d, sync=%d, first render=%d, after final swap=%d",
                    sinceLastTime,
                    syncTime,
@@ -965,12 +965,12 @@ void QSGThreadedRenderLoop::polishAndSync()
 
     RLDEBUG("GUI: polishAndSync()");
 
-#ifndef QSG_NO_WINDOW_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     QElapsedTimer timer;
     int polishTime = 0;
     int waitTime = 0;
     int syncTime;
-    if (qquick_window_timing)
+    if (qsg_render_timing)
         timer.start();
 #endif
 
@@ -980,8 +980,8 @@ void QSGThreadedRenderLoop::polishAndSync()
         QQuickWindowPrivate *d = QQuickWindowPrivate::get(w.window);
         d->polishItems();
     }
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         polishTime = timer.elapsed();
 #endif
 
@@ -993,8 +993,8 @@ void QSGThreadedRenderLoop::polishAndSync()
     m_thread->postEvent(new QEvent(WM_RequestSync));
 
     RLDEBUG("GUI:  - wait for sync...");
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         waitTime = timer.elapsed();
 #endif
     m_thread->waitCondition.wait(&m_thread->mutex);
@@ -1002,8 +1002,8 @@ void QSGThreadedRenderLoop::polishAndSync()
     m_thread->mutex.unlock();
     RLDEBUG("GUI:  - unlocked after sync...");
 
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         syncTime = timer.elapsed();
 #endif
 
@@ -1021,8 +1021,8 @@ void QSGThreadedRenderLoop::polishAndSync()
         maybePostPolishRequest();
     }
 
-#ifndef QSG_NO_WINDOW_TIMING
-    if (qquick_window_timing)
+#ifndef QSG_NO_RENDER_TIMING
+    if (qsg_render_timing)
         qDebug(" - polish=%d, wait=%d, sync=%d -- animations=%d", polishTime, waitTime - polishTime, syncTime - waitTime, int(timer.elapsed() - syncTime));
 #endif
 }

diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index cd95d9f..18b5627 100644 (file)
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -69,8 +69,8 @@
 static bool qsg_leak_check = !qgetenv("QML_LEAK_CHECK").isEmpty();
 #endif
 
-#ifndef QSG_NO_RENDERER_TIMING
-static bool qsg_render_timing = !qgetenv("QML_RENDERER_TIMING").isEmpty();
+#ifndef QSG_NO_RENDER_TIMING
+static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty();
 static QElapsedTimer qsg_renderer_timer;
 #endif
 
@@ -613,7 +613,7 @@ void QSGPlainTexture::bind()
 
     m_dirty_texture = false;
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     if (qsg_render_timing)
         qsg_renderer_timer.start();
 #endif
@@ -621,7 +621,7 @@ void QSGPlainTexture::bind()
     if (m_image.isNull()) {
         if (m_texture_id && m_owns_texture) {
             glDeleteTextures(1, &m_texture_id);
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
             if (qsg_render_timing) {
                 printf("   - texture deleted in %dms (size: %dx%d)\n",
                        (int) qsg_renderer_timer.elapsed(),
@@ -644,7 +644,7 @@ void QSGPlainTexture::bind()
         glGenTextures(1, &m_texture_id);
     glBindTexture(GL_TEXTURE_2D, m_texture_id);
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int bindTime = 0;
     if (qsg_render_timing)
         bindTime = qsg_renderer_timer.elapsed();
@@ -658,7 +658,7 @@ void QSGPlainTexture::bind()
                  ? m_image
                  : m_image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int convertTime = 0;
     if (qsg_render_timing)
         convertTime = qsg_renderer_timer.elapsed();
@@ -685,14 +685,14 @@ void QSGPlainTexture::bind()
         qsg_swizzleBGRAToRGBA(&tmp);
     }
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int swizzleTime = 0;
     if (qsg_render_timing)
         swizzleTime = qsg_renderer_timer.elapsed();
 #endif
     glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, externalFormat, GL_UNSIGNED_BYTE, tmp.constBits());
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int uploadTime = 0;
     if (qsg_render_timing)
         uploadTime = qsg_renderer_timer.elapsed();
@@ -705,7 +705,7 @@ void QSGPlainTexture::bind()
         m_mipmaps_generated = true;
     }
 
-#ifndef QSG_NO_RENDERER_TIMING
+#ifndef QSG_NO_RENDER_TIMING
     int mipmapTime = 0;
     if (qsg_render_timing) {
         mipmapTime = qsg_renderer_timer.elapsed();