diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:04 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:53 +0100 |
| commit | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (patch) | |
| tree | 1c3dec7b83ebd2bef910075889dc2c39697933ea /src/quick/scenegraph/util/qsgtexture.cpp | |
| parent | a9bef84675f6b67bb88a2bb99e45aba889795251 (diff) | |
| parent | 2f9099443d9acd6583e92785afbb38b2e4dcbfd5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 51b3bafaf7..df724d8a01 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -629,7 +629,7 @@ void QSGPlainTexture::bind() glDeleteTextures(1, &m_texture_id); #ifndef QSG_NO_RENDER_TIMING if (qsg_render_timing) { - printf(" - texture deleted in %dms (size: %dx%d)\n", + qDebug(" - texture deleted in %dms (size: %dx%d)", (int) qsg_renderer_timer.elapsed(), m_texture_size.width(), m_texture_size.height()); @@ -725,7 +725,7 @@ void QSGPlainTexture::bind() if (qsg_render_timing) { mipmapTime = qsg_renderer_timer.nsecsElapsed(); - printf(" - plaintexture(%dx%d) bind=%d, convert=%d, swizzle=%d (%s->%s), upload=%d, mipmap=%d, total=%d\n", + qDebug(" - plaintexture(%dx%d) bind=%d, convert=%d, swizzle=%d (%s->%s), upload=%d, mipmap=%d, total=%d", m_texture_size.width(), m_texture_size.height(), int(bindTime/1000000), int((convertTime - bindTime)/1000000), |