diff options
author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2014-11-17 12:25:41 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2014-11-18 12:41:48 +0200 |
commit | 9dcb3e901a179f9211e5431ec966fb0b7de01429 (patch) | |
tree | 7bee4d1044e52f8a4b103f545d8dc42815a36ed9 /src/plugins/scenegraph/softwarecontext/context.cpp | |
parent | 139ace5b57b82396dc37a6781bfae4a251172764 (diff) |
Logging: use category names different from those in declarative
Otherwise we end up with duplicated symbols when linking
statically.
This partly reverts commit 139ace5b57b82396dc37a6781bfae4a251172764.
Change-Id: I0b33cc00d19e7c541b33a72a7d27e1c0a895d988
Task-number: QTBUG-42679
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/context.cpp')
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/context.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp index 1d3bec674d..d25406ce2d 100644 --- a/src/plugins/scenegraph/softwarecontext/context.cpp +++ b/src/plugins/scenegraph/softwarecontext/context.cpp @@ -47,6 +47,29 @@ static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty(); #endif +// 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_RASTER_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_RASTER_LOG_RENDERLOOP, "qt.scenegraph.renderloop") + +// GLSL shader compilation +Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_COMPILATION, "qt.scenegraph.time.compilation") + +// polish, animations, sync, render and swap in the render loop +Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_RENDERLOOP, "qt.scenegraph.time.renderloop") + +// Texture uploads and swizzling +Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_TEXTURE, "qt.scenegraph.time.texture") + +// Glyph preparation (only for distance fields atm) +Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_GLYPH, "qt.scenegraph.time.glyph") + +// Timing inside the renderer base class +Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_RENDERER, "qt.scenegraph.time.renderer") + namespace SoftwareContext { |