diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-28 12:30:33 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2019-01-16 12:51:44 +0000 |
commit | 017e1fa058d133ff4943907bd97822344183a619 (patch) | |
tree | 7756a052245e5df74473d4c7eee2f3324e4938e0 /src/hardwareintegration | |
parent | eef9f34e58465458420f6e1295bdce4a59702c54 (diff) |
Member init for some variables that are not covered by constructors
Where it makes sense, default init variables to sensible values
Change-Id: Ie2aa6ab79a6a3c8322bb0ff804f340f7ffd1c1d1
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Diffstat (limited to 'src/hardwareintegration')
9 files changed, 11 insertions, 11 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 9a614f58e..420f8d20f 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -91,7 +91,7 @@ private: struct wl_display *m_waylandDisplay = nullptr; struct qt_brcm *m_waylandBrcm = nullptr; - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; }; } diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h index d27333576..d95ea9410 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h @@ -71,7 +71,7 @@ public: EGLContext eglContext() const { return m_context; } private: - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; EGLContext m_context; EGLConfig m_config; diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index 2c65969f8..64201476d 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -101,7 +101,7 @@ private: PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture; QWaylandDisplay *m_display = nullptr; - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; bool m_egl_initialized = false; }; diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index 0bfbe0ea4..588366aa7 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -118,7 +118,7 @@ private: PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture; PFNEGLHYBRISCREATEREMOTEBUFFERPROC m_egl_create_buffer; QWaylandDisplay *m_display = nullptr; - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; bool m_egl_initialized = false; }; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index 9e876ac17..0391bb267 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -83,7 +83,7 @@ public: private: void updateGLFormat(); - EGLDisplay m_eglDisplay; + EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; QWaylandDisplay *m_display = nullptr; EGLContext m_context; EGLContext m_shareEGLContext; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 7037ee2d0..5fe21d7b7 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -97,9 +97,9 @@ private: struct qt_xcomposite *mWaylandComposite = nullptr; Display *mDisplay = nullptr; - EGLDisplay mEglDisplay; - int mScreen; - Window mRootWindow; + EGLDisplay mEglDisplay = EGL_NO_DISPLAY; + int mScreen = 0; + Window mRootWindow = -1; static void wlDisplayHandleGlobal(void *data, struct ::wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index ff329c1a1..214a03fda 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -116,7 +116,7 @@ public: inline void glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); private: - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; PFNEGLCREATEDRMIMAGEMESAPROC m_egl_create_drm_image; PFNEGLEXPORTDRMIMAGEMESAPROC m_egl_export_drm_image; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture_2d; diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index f4b297785..a5ca424b1 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -121,7 +121,7 @@ public: inline void eglHybrisSerializeNativeBuffer(EGLClientBuffer buffer, int *ints, int *fds); private: - EGLDisplay m_egl_display; + EGLDisplay m_egl_display = EGL_NO_DISPLAY; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_gl_egl_image_target_texture_2d; PFNEGLHYBRISCREATENATIVEBUFFERPROC m_egl_create_buffer; diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index aa6c5b87a..514ae09cf 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -62,7 +62,7 @@ public: private: Display *mDisplay = nullptr; - EGLDisplay mEglDisplay; + EGLDisplay mEglDisplay = EGL_NO_DISPLAY; }; class XCompositeEglClientBuffer : public QtWayland::ClientBuffer |