diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:34 +0100 |
| commit | ee58fc0edc94d18c2ab6d30f1836b23606ab2195 (patch) | |
| tree | ab6a8ff67ebee6de5ad36f45970376790ea5c30d /src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h | |
| parent | 4060e1416d0340b6c31ee193db6be3ce8083a4cd (diff) | |
| parent | 44e3a9d321190f2958e1a1bdfa7f840e56355279 (diff) | |
Merge dev into 5.9
Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
Diffstat (limited to 'src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h')
| -rw-r--r-- | src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h | 10 |
1 files changed, 5 insertions, 5 deletions
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; |