diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-04-04 09:39:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-04 19:46:51 +0200 |
| commit | 1df6e3a109818f93362b50f320709f188287f2e2 (patch) | |
| tree | 0fde411872138324e982519b5c64605f60fa43df /src/quick/scenegraph/util/qsgtexture.cpp | |
| parent | a487974f663bd03309f45d82b380c00eb2829dae (diff) | |
Our debug env vars are a mess. Standardize on QSG_RENDER_TIMING
Change-Id: I4e88b479a8a9a5126312a05800e8170511b1f7ac
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index cd95d9f445..18b562711c 100644 --- 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(); |