summaryrefslogtreecommitdiffstats
path: root/examples/wayland/minimal-cpp/compositor.h
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@gmail.com>2016-09-07 17:10:49 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2016-10-01 15:42:54 +0000
commit844204b2b04d0f3477d069db326f0e70129c71e2 (patch)
treec7134c0b7991192131c82fb14455cfbdfc4d9a14 /examples/wayland/minimal-cpp/compositor.h
parent2cfefb35b755e1489aff1a3c427d781e8b887223 (diff)
Refactor buffer handling
We cannot support bindToTexture() functions. On some platforms the texture is provided by the driver. Therefore, the HW integration must always provide a texture. This has the added bonus of unifying the two separate code paths that were introduced when EGLStream support was added. Add a separate buffer manager that owns all buffers. Don't destroy buffer objects on release. The client will probably attach them again later. Also, release shm buffers immediately after uploading to texture (needs to be documented that image() will not work afterwards). Make the old SurfaceBuffer class into an abstract base class, so we can store state in the buffer class instead of having to map from the wl_resource in each buffer integration. Move the shared memory buffer handling into a separate subclass. Change-Id: I81e471d13c92913d31ea1efe487f93fa908b5e0c Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'examples/wayland/minimal-cpp/compositor.h')
-rw-r--r--examples/wayland/minimal-cpp/compositor.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h
index fe379082c..e44a8eb52 100644
--- a/examples/wayland/minimal-cpp/compositor.h
+++ b/examples/wayland/minimal-cpp/compositor.h
@@ -48,17 +48,18 @@
QT_BEGIN_NAMESPACE
class Window;
+class QOpenGLTexture;
class View : public QWaylandView
{
Q_OBJECT
public:
View() : m_texture(0) {}
- GLuint getTexture();
+ QOpenGLTexture *getTexture();
bool isCursor() const;
private:
friend class Compositor;
- GLuint m_texture;
+ QOpenGLTexture *m_texture;
};
class Compositor : public QWaylandCompositor