diff options
Diffstat (limited to 'src/hardwareintegration')
24 files changed, 106 insertions, 104 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 6f1e4d920..0a913bcdf 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -66,13 +66,13 @@ public: QWaylandBrcmEglIntegration(); ~QWaylandBrcmEglIntegration(); - void initialize(QWaylandDisplay *waylandDisplay) Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *waylandDisplay) override; - bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; } - bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; } + bool supportsThreadedOpenGL() const override { return true; } + bool supportsWindowDecoration() const override { return false; } QWaylandWindow *createEglWindow(QWindow *window); - QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE; + QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override; EGLDisplay eglDisplay() const; diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h index 5874fb60f..be88df9af 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h @@ -60,10 +60,10 @@ class QWaylandBrcmEglWindow : public QWaylandWindow public: QWaylandBrcmEglWindow(QWindow *window); ~QWaylandBrcmEglWindow(); - WindowType windowType() const Q_DECL_OVERRIDE; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + WindowType windowType() const override; + void setGeometry(const QRect &rect) override; - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; bool makeCurrent(EGLContext context); void swapBuffers(); diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h index a79cfcc68..ee8bc86fe 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h @@ -58,14 +58,14 @@ public: QWaylandBrcmGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share); ~QWaylandBrcmGLContext(); - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; - void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE; + void (*getProcAddress(const char *procName)) () override; - QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } + QSurfaceFormat format() const override { return m_format; } EGLConfig eglConfig() const; EGLContext eglContext() const { return m_context; } diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index e55eee540..f848f190e 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -71,7 +71,7 @@ class DrmServerBuffer : public QWaylandServerBuffer public: DrmServerBuffer(DrmEglServerBufferIntegration *integration, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format); ~DrmServerBuffer(); - void bindTextureToBuffer() Q_DECL_OVERRIDE; + void bindTextureToBuffer() override; private: DrmEglServerBufferIntegration *m_integration; EGLImageKHR m_image; @@ -83,16 +83,16 @@ class DrmEglServerBufferIntegration , public QtWayland::qt_drm_egl_server_buffer { public: - void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *display) override; - virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) Q_DECL_OVERRIDE; + virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; inline EGLImageKHR eglCreateImageKHR(EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); inline EGLBoolean eglDestroyImageKHR (EGLImageKHR image); inline void glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); protected: - void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE; - void drm_egl_server_buffer_server_buffer_created(struct ::qt_server_buffer *id, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) Q_DECL_OVERRIDE; + void registry_global(uint32_t name, const QString &interface, uint32_t version) override; + void drm_egl_server_buffer_server_buffer_created(struct ::qt_server_buffer *id, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) override; private: PFNEGLCREATEIMAGEKHRPROC m_egl_create_image; PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image; diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index 5e5bade0f..e9f0689a2 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -75,10 +75,10 @@ class LibHybrisServerBuffer : public QWaylandServerBuffer, public QtWayland::qt_ public: LibHybrisServerBuffer(LibHybrisEglServerBufferIntegration *integration, int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format); ~LibHybrisServerBuffer(); - void bindTextureToBuffer() Q_DECL_OVERRIDE; + void bindTextureToBuffer() override; protected: - void libhybris_buffer_add_fd(int32_t fd) Q_DECL_OVERRIDE; + void libhybris_buffer_add_fd(int32_t fd) override; private: LibHybrisEglServerBufferIntegration *m_integration; @@ -96,9 +96,9 @@ class LibHybrisEglServerBufferIntegration , public QtWayland::qt_libhybris_egl_server_buffer { public: - void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *display) override; - virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) Q_DECL_OVERRIDE; + virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; inline EGLImageKHR eglCreateImageKHR(EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); inline EGLBoolean eglDestroyImageKHR (EGLImageKHR image); @@ -106,9 +106,9 @@ public: inline EGLBoolean eglHybrisCreateRemoteBuffer(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint stride, int num_ints, int *ints, int num_fds, int *fds, EGLClientBuffer *buffer); protected: - void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE; + void registry_global(uint32_t name, const QString &interface, uint32_t version) override; void libhybris_egl_server_buffer_server_buffer_created(struct ::qt_libhybris_buffer *id, struct ::qt_server_buffer *qid, - int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) Q_DECL_OVERRIDE; + int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) override; private: PFNEGLCREATEIMAGEKHRPROC m_egl_create_image; PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h index 2faa02ecf..427a30d8e 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h @@ -58,16 +58,16 @@ public: QWaylandEglClientBufferIntegration(); ~QWaylandEglClientBufferIntegration(); - void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE; - bool supportsWindowDecoration() const Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *display) override; + bool isValid() const override; + bool supportsThreadedOpenGL() const override; + bool supportsWindowDecoration() const override; - QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE; - QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE; + QWaylandWindow *createEglWindow(QWindow *window) override; + QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override; - void *nativeResource(NativeResource resource) Q_DECL_OVERRIDE; - void *nativeResourceForContext(NativeResource resource, QPlatformOpenGLContext *context) Q_DECL_OVERRIDE; + void *nativeResource(NativeResource resource) override; + void *nativeResourceForContext(NativeResource resource, QPlatformOpenGLContext *context) override; EGLDisplay eglDisplay() const; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index bf656689a..e471a8f7c 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -58,10 +58,10 @@ class QWaylandEglWindow : public QWaylandWindow public: QWaylandEglWindow(QWindow *window); ~QWaylandEglWindow(); - WindowType windowType() const Q_DECL_OVERRIDE; + WindowType windowType() const override; void updateSurface(bool create); - virtual void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + virtual void setGeometry(const QRect &rect) override; QRect contentsRect() const; EGLSurface eglSurface() const; @@ -69,12 +69,12 @@ public: GLuint contentTexture() const; bool needToUpdateContentFBO() const { return decoration() && (m_resize || !m_contentFBO); } - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; void bindContentFBO(); - void invalidateSurface() Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void invalidateSurface() override; + void setVisible(bool visible) override; private Q_SLOTS: void doInvalidateSurface(); diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index d528b2327..6d9887de6 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -63,19 +63,19 @@ public: QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *display, const QSurfaceFormat &format, QPlatformOpenGLContext *share); ~QWaylandGLContext(); - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; - GLuint defaultFramebufferObject(QPlatformSurface *surface) const Q_DECL_OVERRIDE; + GLuint defaultFramebufferObject(QPlatformSurface *surface) const override; - bool isSharing() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + bool isSharing() const override; + bool isValid() const override; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) override; - QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } + QSurfaceFormat format() const override { return m_format; } EGLConfig eglConfig() const; EGLContext eglContext() const { return m_context; } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 612421bed..cdc071e55 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -75,10 +75,10 @@ public: QWaylandXCompositeEGLClientBufferIntegration(); ~QWaylandXCompositeEGLClientBufferIntegration(); - void initialize(QWaylandDisplay *dispaly) Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *dispaly) override; - QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE; - QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE; + QWaylandWindow *createEglWindow(QWindow *window) override; + QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override; QWaylandDisplay *waylandDisplay() const; struct qt_xcomposite *waylandXComposite() const; @@ -88,8 +88,8 @@ public: int screen() const; Window rootWindow() const; - bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; } - bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; } + bool supportsThreadedOpenGL() const override { return true; } + bool supportsWindowDecoration() const override { return false; } private: QWaylandDisplay *mWaylandDisplay; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h index 83a643757..e0b70bf21 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h @@ -57,10 +57,10 @@ class QWaylandXCompositeEGLContext : public QEGLPlatformContext public: QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config); - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; private: - EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) Q_DECL_OVERRIDE; + EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override; }; } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h index 1203c7ee8..5b7d492c5 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -54,9 +54,9 @@ class QWaylandXCompositeEGLWindow : public QWaylandWindow { public: QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration); - WindowType windowType() const Q_DECL_OVERRIDE; + WindowType windowType() const override; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; EGLSurface eglSurface() const; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h index 5847ea976..d95f57be7 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h @@ -57,14 +57,14 @@ class QWaylandXCompositeGLXContext : public QPlatformOpenGLContext public: QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) override; private: GLXContext m_context; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index bd8fe4108..288bf3111 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -70,10 +70,10 @@ public: QWaylandXCompositeGLXIntegration(); ~QWaylandXCompositeGLXIntegration(); - void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE; + void initialize(QWaylandDisplay *display) override; - QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE; - QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE; + QWaylandWindow *createEglWindow(QWindow *window) override; + QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override; QWaylandDisplay *waylandDisplay() const; struct qt_xcomposite *waylandXComposite() const; @@ -82,8 +82,8 @@ public: int screen() const; Window rootWindow() const; - bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return false; } - bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; } + bool supportsThreadedOpenGL() const override { return false; } + bool supportsWindowDecoration() const override { return false; } private: QWaylandDisplay *mWaylandDisplay; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h index 7318044f3..aeb5c14ec 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -56,9 +56,9 @@ class QWaylandXCompositeGLXWindow : public QWaylandWindow { public: QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration); - WindowType windowType() const Q_DECL_OVERRIDE; + WindowType windowType() const override; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; Window xWindow() const; diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h index ef6f613b8..479e05c1b 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h @@ -62,8 +62,8 @@ public: static BrcmBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<BrcmBuffer*>(Resource::fromResource(resource)->buffer_object); } protected: - void buffer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE; - void buffer_destroy(Resource *resource) Q_DECL_OVERRIDE; + void buffer_destroy_resource(Resource *resource) override; + void buffer_destroy(Resource *resource) override; private: QVector<EGLint> m_handle; diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h index a1d39e4fe..402f51b98 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -54,12 +54,12 @@ class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtW public: BrcmEglIntegration(); - void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; - QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) override; + QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; protected: - void brcm_bind_resource(Resource *resource) Q_DECL_OVERRIDE; - void brcm_create_buffer(Resource *resource, uint32_t id, int32_t width, int32_t height, wl_array *data) Q_DECL_OVERRIDE; + void brcm_bind_resource(Resource *resource) override; + void brcm_create_buffer(Resource *resource, uint32_t id, int32_t width, int32_t height, wl_array *data) override; private: Q_DISABLE_COPY(BrcmEglIntegration) @@ -71,10 +71,10 @@ class BrcmEglClientBuffer : public QtWayland::ClientBuffer public: BrcmEglClientBuffer(BrcmEglIntegration *integration, wl_resource *buffer); - QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE; - QSize size() const Q_DECL_OVERRIDE; - QWaylandSurface::Origin origin() const Q_DECL_OVERRIDE; - QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE; + QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override; + QSize size() const override; + QWaylandSurface::Origin origin() const override; + QOpenGLTexture *toOpenGlTexture(int plane) override; private: BrcmEglIntegration *m_integration; QOpenGLTexture *m_texture; diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index 5cd7bcf5b..d9072b069 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -75,8 +75,8 @@ class DrmEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServe public: DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format); - struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE; - void bindTextureToBuffer() Q_DECL_OVERRIDE; + struct ::wl_resource *resourceForClient(struct ::wl_client *) override; + void bindTextureToBuffer() override; private: DrmEglServerBufferIntegration *m_integration; @@ -98,8 +98,8 @@ public: void initializeHardware(QWaylandCompositor *); - bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE; - QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE; + bool supportsFormat(QtWayland::ServerBuffer::Format format) const override; + QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override; EGLDisplay display() const { return m_egl_display; } diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index 572c681be..130654d63 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -77,8 +77,8 @@ class LibHybrisEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylan public: LibHybrisEglServerBuffer(LibHybrisEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format); - struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE; - void bindTextureToBuffer() Q_DECL_OVERRIDE; + struct ::wl_resource *resourceForClient(struct ::wl_client *) override; + void bindTextureToBuffer() override; private: LibHybrisEglServerBufferIntegration *m_integration; @@ -104,8 +104,8 @@ public: void initializeHardware(QWaylandCompositor *); - bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE; - QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE; + bool supportsFormat(QtWayland::ServerBuffer::Format format) const override; + QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override; EGLDisplay display() const { return m_egl_display; } diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index 8b87db971..1e6723a04 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -298,8 +298,10 @@ void WaylandEglClientBufferIntegrationPrivate::init_egl_fd_texture(WaylandEglCli } state.eglMode = BufferState::ModeEGLStream; - if (!QOpenGLContext::currentContext()) + if (!QOpenGLContext::currentContext()) { qWarning("EglClientBufferIntegration: creating texture with no current context"); + return; + } //TODO This texture might end up in a different context than the quick item which wants to use it, this needs to be fixed somehow. diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index c93ce1dd8..e0235d84c 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -51,7 +51,7 @@ class WaylandEglClientBufferIntegration : public QtWayland::ClientBufferIntegrat public: WaylandEglClientBufferIntegration(); - void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) override; QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer); @@ -65,13 +65,13 @@ struct BufferState; class WaylandEglClientBuffer : public QtWayland::ClientBuffer { public: - QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE; - QSize size() const Q_DECL_OVERRIDE; - QWaylandSurface::Origin origin() const Q_DECL_OVERRIDE; - quintptr lockNativeBuffer() Q_DECL_OVERRIDE; - void unlockNativeBuffer(quintptr native_buffer) const Q_DECL_OVERRIDE; - QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE; - void setCommitted(QRegion &damage) Q_DECL_OVERRIDE; + QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override; + QSize size() const override; + QWaylandSurface::Origin origin() const override; + quintptr lockNativeBuffer() override; + void unlockNativeBuffer(quintptr native_buffer) const override; + QOpenGLTexture *toOpenGlTexture(int plane) override; + void setCommitted(QRegion &damage) override; private: friend class WaylandEglClientBufferIntegration; diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index ec4ea284b..fb869b2e7 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -52,8 +52,8 @@ class XCompositeEglClientBufferIntegration : public QtWayland::ClientBufferInteg public: XCompositeEglClientBufferIntegration(); - void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; - QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) override; + QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; inline Display *xDisplay() const { return mDisplay; } inline EGLDisplay eglDisplay() const { return mEglDisplay; } @@ -69,8 +69,8 @@ public: QSize size() const; QWaylandSurface::Origin origin() const; - QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE; - QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE { + QOpenGLTexture *toOpenGlTexture(int plane) override; + QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override { return QWaylandBufferRef::BufferFormatEgl_RGBA; } diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 7b63f976e..2776ad353 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -55,8 +55,8 @@ public: XCompositeGLXClientBufferIntegration(); ~XCompositeGLXClientBufferIntegration(); - void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; - QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) override; + QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; inline Display *xDisplay() const { return mDisplay; } inline int xScreen() const { return mScreen; } @@ -77,8 +77,8 @@ public: QSize size() const; QWaylandSurface::Origin origin() const; - QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE; - QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE { + QOpenGLTexture *toOpenGlTexture(int plane) override; + QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override { return QWaylandBufferRef::BufferFormatEgl_RGBA; } diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h index 318b17873..6f17f7e39 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -68,8 +68,8 @@ public: static XCompositeBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<XCompositeBuffer*>(Resource::fromResource(resource)->buffer_object); } protected: - void buffer_destroy_resource(Resource *) Q_DECL_OVERRIDE; - void buffer_destroy(Resource *) Q_DECL_OVERRIDE; + void buffer_destroy_resource(Resource *) override; + void buffer_destroy(Resource *) override; private: Window mWindow; diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h index 482224b66..b2a612068 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h @@ -56,9 +56,9 @@ private: QString mDisplayString; - void xcomposite_bind_resource(Resource *resource) Q_DECL_OVERRIDE; + void xcomposite_bind_resource(Resource *resource) override; void xcomposite_create_buffer(Resource *resource, uint32_t id, uint32_t x_window, - int32_t width, int32_t height) Q_DECL_OVERRIDE; + int32_t width, int32_t height) override; }; |