aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scenegraph/softwarecontext
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@theqtcompany.com>2014-11-17 10:54:10 +0100
committerAndy Nichols <andy.nichols@digia.com>2014-11-17 12:00:51 +0200
commit139ace5b57b82396dc37a6781bfae4a251172764 (patch)
tree7bb00df64bb65b5491ad52e02698195680025d5b /src/plugins/scenegraph/softwarecontext
parentcc972dc16c5ebcff5e8dc728f98605ad4e899c8c (diff)
Logging: include logging categories from qsgcontext_p.h
The logging categories used in this module are already defined in qtdeclarative, which this module depends on. We could just use Q_DECLARE_LOGGING_CATEGORY instead of Q_LOGGING_CATEGORY, but even simpler is to just include the private header file where they are already declared. Change-Id: I5adb0cfc5fd4fed234935820e52d7c7e7a797fae Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext')
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderloop.cpp25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp
index 0129123a37..fc7e92c6b8 100644
--- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp
@@ -23,30 +23,7 @@
#include <private/qquickwindow_p.h>
#include <QElapsedTimer>
#include <private/qquickprofiler_p.h>
-
-// Used for very high-level info about the renderering and gl context
-// Includes GL_VERSION, type of render loop, atlas size, etc.
-Q_LOGGING_CATEGORY(QSG_LOG_INFO, "qt.scenegraph.info")
-
-// Used to debug the renderloop logic. Primarily useful for platform integrators
-// and when investigating the render loop logic.
-Q_LOGGING_CATEGORY(QSG_LOG_RENDERLOOP, "qt.scenegraph.renderloop")
-
-
-// GLSL shader compilation
-Q_LOGGING_CATEGORY(QSG_LOG_TIME_COMPILATION, "qt.scenegraph.time.compilation")
-
-// polish, animations, sync, render and swap in the render loop
-Q_LOGGING_CATEGORY(QSG_LOG_TIME_RENDERLOOP, "qt.scenegraph.time.renderloop")
-
-// Texture uploads and swizzling
-Q_LOGGING_CATEGORY(QSG_LOG_TIME_TEXTURE, "qt.scenegraph.time.texture")
-
-// Glyph preparation (only for distance fields atm)
-Q_LOGGING_CATEGORY(QSG_LOG_TIME_GLYPH, "qt.scenegraph.time.glyph")
-
-// Timing inside the renderer base class
-Q_LOGGING_CATEGORY(QSG_LOG_TIME_RENDERER, "qt.scenegraph.time.renderer")
+#include <private/qsgcontext_p.h>
RenderLoop::RenderLoop()
: eventPending(false)