From 139ace5b57b82396dc37a6781bfae4a251172764 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 17 Nov 2014 10:54:10 +0100 Subject: 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 --- .../scenegraph/softwarecontext/renderloop.cpp | 25 +--------------------- 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src') 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 #include #include - -// 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 RenderLoop::RenderLoop() : eventPending(false) -- cgit v1.2.3