From cf8fd0dec1593d063be36774a1a6bd3ac336c053 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 26 Jun 2017 12:27:19 +0200 Subject: Update server buffer integration Fix crashes, and change the (private) API to be more usable. The libhybris code compiles without warnings, but is untested. Change-Id: I1433daf1ba76d7869d1dfe260642199ce5a1b849 Reviewed-by: Johan Helsing --- src/compositor/hardware_integration/qwlserverbufferintegration_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/compositor/hardware_integration/qwlserverbufferintegration_p.h') diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h index 4754e751f..c27fd4e44 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h @@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE class QWaylandCompositor; class QOpenGLContext; +class QOpenGLTexture; +class QImage; namespace QtWayland { class Display; @@ -81,7 +83,7 @@ public: virtual struct ::wl_resource *resourceForClient(struct ::wl_client *) = 0; - virtual void bindTextureToBuffer() = 0; + virtual QOpenGLTexture *toOpenGlTexture() = 0; virtual bool isYInverted() const; @@ -101,7 +103,7 @@ public: virtual void initializeHardware(QWaylandCompositor *); virtual bool supportsFormat(ServerBuffer::Format format) const = 0; - virtual ServerBuffer *createServerBuffer(const QSize &size, ServerBuffer::Format format) = 0; + virtual ServerBuffer *createServerBufferFromImage(const QImage &qimage, ServerBuffer::Format format) = 0; }; } -- cgit v1.2.3