qtubuntu

Merge lp:~gerboland/qtubuntu/graphics-logging-category into lp:qtubuntu

  1. graphics-logging-category
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 333
Merged at revision: 336
Proposed branch: lp:~gerboland/qtubuntu/graphics-logging-category
Merge into: lp:qtubuntu
Prerequisite: lp:~gerboland/qtubuntu/eglconvenience-retry
Diff against target: 127 lines (+19/-10)
6 files modified
README (+2/-0)
src/ubuntumirclient/cursor.cpp (+3/-1)
src/ubuntumirclient/glcontext.cpp (+7/-5)
src/ubuntumirclient/integration.cpp (+1/-1)
src/ubuntumirclient/logging.h (+2/-0)
src/ubuntumirclient/window.cpp (+4/-3)
To merge this branch: bzr merge lp:~gerboland/qtubuntu/graphics-logging-category
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+298153@code.launchpad.net

Commit message

Logging: separate graphics & cursor logging into their own logging categories

To post a comment you must log in.
lp:~gerboland/qtubuntu/graphics-logging-category updated
332. By Gerry Boland

Put cursor in its own category too

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:332
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/92/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2119
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2147
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2057
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2057
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2057
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2048/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/92/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

In src/ubuntumirclient/window.cpp:

"""
qCDebug(ubuntumirclientGraphics(), "Attempting to choose OpenGL 1.4 context which may suit Mesa");
"""

You really need those parentheses on ubuntumirclientGraphics?

review: Needs Information
lp:~gerboland/qtubuntu/graphics-logging-category updated
333. By Gerry Boland

remove parens

Revision history for this message
Gerry Boland (gerboland) wrote :

Not intended, good catch

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:333
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/95/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2332
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2360
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2250
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2250
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2250
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2243/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2243
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2243/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/95/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2016-07-22 08:21:59 +0000
3+++ README 2016-07-22 08:21:59 +0000
4@@ -44,7 +44,9 @@
5 logged and debug messages are disabled. QtUbuntu provides the following
6 logging categories:
7
8+ * ubuntumirclient.cursor - Messages about the cursor.
9 * ubuntumirclient.input - Messages related to input and other Mir events.
10+ * ubuntumirclient.graphics - Messages related to graphics, GL and EGL.
11 * ubuntumirclient.swapBuffers - Messages related to surface buffer swapping.
12 * ubuntumirclient - For all other messages.
13
14
15=== modified file 'src/ubuntumirclient/cursor.cpp'
16--- src/ubuntumirclient/cursor.cpp 2015-12-04 16:19:33 +0000
17+++ src/ubuntumirclient/cursor.cpp 2016-07-22 08:21:59 +0000
18@@ -21,6 +21,8 @@
19
20 #include <mir_toolkit/mir_client_library.h>
21
22+Q_LOGGING_CATEGORY(ubuntumirclientCursor, "ubuntumirclient.cursor", QtWarningMsg)
23+
24 UbuntuCursor::UbuntuCursor(MirConnection *connection)
25 : mConnection(connection)
26 {
27@@ -118,7 +120,7 @@
28
29
30 if (windowCursor) {
31- qCDebug(ubuntumirclient, "changeCursor shape=%s, window=%p", qtCursorShapeToStr(windowCursor->shape()), window);
32+ qCDebug(ubuntumirclientCursor, "changeCursor shape=%s, window=%p", qtCursorShapeToStr(windowCursor->shape()), window);
33 if (!windowCursor->pixmap().isNull()) {
34 configureMirCursorWithPixmapQCursor(surface, *windowCursor);
35 } else if (windowCursor->shape() == Qt::BitmapCursor) {
36
37=== modified file 'src/ubuntumirclient/glcontext.cpp'
38--- src/ubuntumirclient/glcontext.cpp 2016-07-22 08:21:59 +0000
39+++ src/ubuntumirclient/glcontext.cpp 2016-07-22 08:21:59 +0000
40@@ -23,6 +23,8 @@
41 #include <QtPlatformSupport/private/qeglconvenience_p.h>
42 #include <QtGui/private/qopenglcontext_p.h>
43
44+Q_LOGGING_CATEGORY(ubuntumirclientGraphics, "ubuntumirclient.graphics", QtWarningMsg)
45+
46 namespace {
47
48 void printEglConfig(EGLDisplay display, EGLConfig config)
49@@ -31,15 +33,15 @@
50 Q_ASSERT(config != nullptr);
51
52 const char *string = eglQueryString(display, EGL_VENDOR);
53- qCDebug(ubuntumirclient, "EGL vendor: %s", string);
54+ qCDebug(ubuntumirclientGraphics, "EGL vendor: %s", string);
55
56 string = eglQueryString(display, EGL_VERSION);
57- qCDebug(ubuntumirclient, "EGL version: %s", string);
58+ qCDebug(ubuntumirclientGraphics, "EGL version: %s", string);
59
60 string = eglQueryString(display, EGL_EXTENSIONS);
61- qCDebug(ubuntumirclient, "EGL extensions: %s", string);
62+ qCDebug(ubuntumirclientGraphics, "EGL extensions: %s", string);
63
64- qCDebug(ubuntumirclient, "EGL configuration attributes:");
65+ qCDebug(ubuntumirclientGraphics, "EGL configuration attributes:");
66 q_printEglConfig(display, config);
67 }
68
69@@ -49,7 +51,7 @@
70 EGLDisplay display)
71 : QEGLPlatformContext(format, share, display, 0)
72 {
73- if (ubuntumirclient().isDebugEnabled()) {
74+ if (ubuntumirclientGraphics().isDebugEnabled()) {
75 printEglConfig(display, eglConfig());
76 }
77 }
78
79=== modified file 'src/ubuntumirclient/integration.cpp'
80--- src/ubuntumirclient/integration.cpp 2016-07-22 08:21:59 +0000
81+++ src/ubuntumirclient/integration.cpp 2016-07-22 08:21:59 +0000
82@@ -265,7 +265,7 @@
83 // requested OpenGL version to 1.0 to ensure EGL will give us a working context (lp:1549455).
84 static const bool isMesa = QString(eglQueryString(mEglDisplay, EGL_VENDOR)).contains(QStringLiteral("Mesa"));
85 if (isMesa) {
86- qCDebug(ubuntumirclient, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
87+ qCDebug(ubuntumirclientGraphics, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
88 format.setMajorVersion(1);
89 format.setMinorVersion(4);
90 delete platformContext;
91
92=== modified file 'src/ubuntumirclient/logging.h'
93--- src/ubuntumirclient/logging.h 2015-12-09 13:02:07 +0000
94+++ src/ubuntumirclient/logging.h 2016-07-22 08:21:59 +0000
95@@ -24,5 +24,7 @@
96 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclient)
97 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientBufferSwap)
98 Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
99+Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientGraphics)
100+Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientCursor)
101
102 #endif // QUBUNTULOGGING_H
103
104=== modified file 'src/ubuntumirclient/window.cpp'
105--- src/ubuntumirclient/window.cpp 2016-07-22 08:21:59 +0000
106+++ src/ubuntumirclient/window.cpp 2016-07-22 08:21:59 +0000
107@@ -309,7 +309,7 @@
108 // requested OpenGL version to 1.0 to ensure EGL will give us a working context (lp:1549455).
109 static const bool isMesa = QString(eglQueryString(display, EGL_VENDOR)).contains(QStringLiteral("Mesa"));
110 if (isMesa) {
111- qCDebug(ubuntumirclient, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
112+ qCDebug(ubuntumirclientGraphics, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
113 mFormat.setMajorVersion(1);
114 mFormat.setMinorVersion(4);
115 config = q_configFromGLFormat(display, mFormat, true);
116@@ -356,8 +356,9 @@
117 QWindowSystemInterface::handleGeometryChange(mWindow, geom);
118
119 qCDebug(ubuntumirclient) << "Created surface with geometry:" << geom << "title:" << mWindow->title()
120- << "role:" << roleFor(mWindow)
121- << "\nRequested format:" << mWindow->requestedFormat()
122+ << "role:" << roleFor(mWindow);
123+ qCDebug(ubuntumirclientGraphics)
124+ << "Requested format:" << mWindow->requestedFormat()
125 << "\nActual format:" << mFormat
126 << "with associated Mir pixel format:" << mirPixelFormatToStr(pixelFormat);
127 }

Subscribers

People subscribed via source and target branches