diff options
Diffstat (limited to 'src/hardwareintegration/client')
23 files changed, 31 insertions, 62 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp index 430b455f4..4478b9fdf 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { QWaylandBrcmEglIntegration::QWaylandBrcmEglIntegration() - : m_waylandDisplay(0) { qDebug() << "Using Brcm-EGL"; } diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 0a913bcdf..8d89ebf74 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -85,7 +85,7 @@ public: private: static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); - struct wl_display *m_waylandDisplay; + struct wl_display *m_waylandDisplay = nullptr; struct qt_brcm *m_waylandBrcm; EGLDisplay m_eglDisplay; diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp index f2709983e..6b3c614a5 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp @@ -67,7 +67,6 @@ public: int count, struct wl_event_queue *eventQueue) : m_size(size) - , m_released(true) , m_display(display) , m_eventQueue(eventQueue) { @@ -119,7 +118,7 @@ public: private: QSize m_size; - bool m_released; + bool m_released = true; wl_array m_array; EGLint *m_data; QWaylandDisplay *m_display; @@ -129,11 +128,8 @@ private: QWaylandBrcmEglWindow::QWaylandBrcmEglWindow(QWindow *window) : QWaylandWindow(window) , m_eglIntegration(static_cast<QWaylandBrcmEglIntegration *>(mDisplay->clientBufferIntegration())) - , m_eglConfig(0) , m_format(window->format()) , m_eventQueue(wl_display_create_queue(mDisplay->wl_display())) - , m_current(0) - , m_count(0) { } diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h index be88df9af..28376669d 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h @@ -77,7 +77,7 @@ private: const QWaylandWindow *m_parentWindow; - EGLConfig m_eglConfig; + EGLConfig m_eglConfig = 0; EGLint m_globalImages[3*5]; EGLSurface m_eglSurfaces[3]; @@ -87,8 +87,8 @@ private: struct wl_event_queue *m_eventQueue; - int m_current; - int m_count; + int m_current = 0; + int m_count = 0; }; } diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp index fe2adbf56..754196468 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp @@ -55,8 +55,7 @@ DrmServerBuffer::DrmServerBuffer(DrmEglServerBufferIntegration *integration , int32_t height , int32_t stride , int32_t format) - : QWaylandServerBuffer() - , m_integration(integration) + : m_integration(integration) { m_size = QSize(width, height); EGLint egl_format; diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp index 51b904e75..252ceb698 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp @@ -60,7 +60,6 @@ LibHybrisServerBuffer::LibHybrisServerBuffer(LibHybrisEglServerBufferIntegration , int32_t format) : QWaylandServerBuffer() , m_integration(integration) - , m_texture(nullptr) , m_stride(stride) , m_hybrisFormat(format) { diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index b3c9c464d..1ba38e6e4 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -83,7 +83,7 @@ protected: private: LibHybrisEglServerBufferIntegration *m_integration; EGLImageKHR m_image; - QOpenGLTexture *m_texture; + QOpenGLTexture *m_texture = nullptr; int m_numFds; QVector<int32_t> m_ints; QVector<int32_t> m_fds; diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp index bc597ebf8..0c43b089a 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp @@ -89,9 +89,7 @@ static QOpenGLTexture *createTextureFromShm(const QString &key, int w, int h, in namespace QtWaylandClient { ShmServerBuffer::ShmServerBuffer(ShmServerBufferIntegration *integration, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format) - : QWaylandServerBuffer() - , m_integration(integration) - , m_texture(nullptr) + : m_integration(integration) , m_key(key) , m_bpl(bytes_per_line) , m_format(format) diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h index ce4032ba4..788344ff6 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h @@ -62,7 +62,7 @@ public: QOpenGLTexture* toOpenGlTexture() override; private: ShmServerBufferIntegration *m_integration; - QOpenGLTexture *m_texture; + QOpenGLTexture *m_texture = nullptr; QString m_key; int m_bpl; int m_format; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp index 8a1009fa8..4b3a635c7 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp @@ -64,9 +64,6 @@ static const char *qwaylandegl_threadedgl_blacklist_vendor[] = { }; QWaylandEglClientBufferIntegration::QWaylandEglClientBufferIntegration() - : m_display(0) - , m_eglDisplay(EGL_NO_DISPLAY) - , m_supportsThreading(false) { qDebug() << "Using Wayland-EGL"; } diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h index 427a30d8e..93edfcc58 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h @@ -72,10 +72,10 @@ public: EGLDisplay eglDisplay() const; private: - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; - EGLDisplay m_eglDisplay; - bool m_supportsThreading; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; + bool m_supportsThreading = false; }; QT_END_NAMESPACE diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp index 87f3e2d4e..870b71c1a 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp @@ -57,10 +57,6 @@ namespace QtWaylandClient { QWaylandEglWindow::QWaylandEglWindow(QWindow *window) : QWaylandWindow(window) , m_clientBufferIntegration(static_cast<QWaylandEglClientBufferIntegration *>(mDisplay->clientBufferIntegration())) - , m_waylandEglWindow(0) - , m_eglSurface(0) - , m_contentFBO(0) - , m_resize(false) { QSurfaceFormat fmt = window->requestedFormat(); if (mDisplay->supportsWindowDecoration()) diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 77aee56dc..94947365c 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -82,14 +82,14 @@ private Q_SLOTS: private: QWaylandEglClientBufferIntegration *m_clientBufferIntegration; - struct wl_egl_window *m_waylandEglWindow; + struct wl_egl_window *m_waylandEglWindow = nullptr; const QWaylandWindow *m_parentWindow; - EGLSurface m_eglSurface; + EGLSurface m_eglSurface = EGL_NO_SURFACE; EGLConfig m_eglConfig; - mutable QOpenGLFramebufferObject *m_contentFBO; - mutable bool m_resize; + mutable bool m_resize = false; + mutable QOpenGLFramebufferObject *m_contentFBO = nullptr; QSurfaceFormat m_format; }; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index 967028861..740ad6b10 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -229,9 +229,6 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis : QPlatformOpenGLContext() , m_eglDisplay(eglDisplay) , m_display(display) - , m_blitter(0) - , mUseNativeDefaultFbo(false) - , mSupportNonBlockingSwap(true) { QSurfaceFormat fmt = format; if (static_cast<QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration())->display()->supportsWindowDecoration()) diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index 6d9887de6..af1c4e04d 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -89,10 +89,10 @@ private: EGLContext m_shareEGLContext; EGLConfig m_config; QSurfaceFormat m_format; - DecorationsBlitter *m_blitter; - bool mUseNativeDefaultFbo; + DecorationsBlitter *m_blitter = nullptr; + bool mUseNativeDefaultFbo = false; uint m_api; - bool mSupportNonBlockingSwap; + bool mSupportNonBlockingSwap = true; friend class DecorationsBlitter; }; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp index 2a7de6b72..aa5367e02 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp @@ -54,8 +54,6 @@ namespace QtWaylandClient { QWaylandXCompositeEGLClientBufferIntegration::QWaylandXCompositeEGLClientBufferIntegration() : QWaylandClientBufferIntegration() - , mWaylandDisplay(0) - , mDisplay(0) { qDebug() << "Using XComposite-EGL"; } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index cdc071e55..3742e1f56 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -92,10 +92,10 @@ public: bool supportsWindowDecoration() const override { return false; } private: - QWaylandDisplay *mWaylandDisplay; + QWaylandDisplay *mWaylandDisplay = nullptr; struct qt_xcomposite *mWaylandComposite; - Display *mDisplay; + Display *mDisplay = nullptr; EGLDisplay mEglDisplay; int mScreen; Window mRootWindow; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp index 9c3dee3fc..57a7ba7b6 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp @@ -57,10 +57,7 @@ namespace QtWaylandClient { QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration) : QWaylandWindow(window) , m_glxIntegration(glxIntegration) - , m_buffer(0) - , m_xWindow(0) , m_config(q_configFromGLFormat(glxIntegration->eglDisplay(), window->format(), true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT)) - , m_surface(0) { } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h index 90b4cc73e..d90159fa7 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -66,11 +66,11 @@ private: void createEglSurface(); QWaylandXCompositeEGLClientBufferIntegration *m_glxIntegration; - QWaylandBuffer *m_buffer; + QWaylandBuffer *m_buffer = nullptr; - Window m_xWindow; + Window m_xWindow = 0; EGLConfig m_config; - EGLSurface m_surface; + EGLSurface m_surface = EGL_NO_SURFACE; }; } diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp index dbd7761e3..090cfb8a0 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp @@ -52,11 +52,6 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { QWaylandXCompositeGLXIntegration::QWaylandXCompositeGLXIntegration() - : mWaylandDisplay(0) - , mWaylandComposite(0) - , mDisplay(0) - , mScreen(0) - , mRootWindow(0) { qDebug() << "Using XComposite-GLX"; } diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index 288bf3111..746678f7a 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -86,12 +86,12 @@ public: bool supportsWindowDecoration() const override { return false; } private: - QWaylandDisplay *mWaylandDisplay; - struct qt_xcomposite *mWaylandComposite; + QWaylandDisplay *mWaylandDisplay = nullptr; + struct qt_xcomposite *mWaylandComposite = nullptr; - Display *mDisplay; - int mScreen; - Window mRootWindow; + Display *mDisplay = nullptr; + int mScreen = 0; + Window mRootWindow = 0; static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp index 9cca9e46e..2b491e24d 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp @@ -54,9 +54,7 @@ namespace QtWaylandClient { QWaylandXCompositeGLXWindow::QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration) : QWaylandWindow(window) , m_glxIntegration(glxIntegration) - , m_xWindow(0) , m_config(qglx_findConfig(glxIntegration->xDisplay(), glxIntegration->screen(), window->format(), GLX_WINDOW_BIT | GLX_PIXMAP_BIT)) - , mBuffer(0) { } diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h index aeb5c14ec..c2df592ee 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -69,9 +69,9 @@ private: QWaylandXCompositeGLXIntegration *m_glxIntegration; - Window m_xWindow; + Window m_xWindow = 0; GLXFBConfig m_config; - QWaylandBuffer *mBuffer; + QWaylandBuffer *mBuffer = nullptr; }; } |