diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-01-03 17:10:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-03 17:37:38 +0100 |
| commit | 4df5d7613a035178bacbdd29569bb7a3453586f1 (patch) | |
| tree | 190734052adc0d68630e62815067180f23f73b3f | |
| parent | 7cb378126c221f8fddac8a7771ba846e627356fa (diff) | |
| download | qtwayland-4df5d7613a035178bacbdd29569bb7a3453586f1.tar.gz qtwayland-4df5d7613a035178bacbdd29569bb7a3453586f1.tar.bz2 qtwayland-4df5d7613a035178bacbdd29569bb7a3453586f1.zip | |
Add a size to the QWaylandServerBuffer on the client side
Change-Id: I48b7d514c1231eb4bd4a30f1329a89515b497269
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
3 files changed, 15 insertions, 8 deletions
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp index ee64624a..6e3abe91 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp @@ -11,6 +11,16 @@ QWaylandServerBuffer::~QWaylandServerBuffer() { } +QWaylandServerBuffer::Format QWaylandServerBuffer::format() const +{ + return m_format; +} + +QSize QWaylandServerBuffer::size() const +{ + return m_size; +} + void QWaylandServerBuffer::setUserData(void *userData) { m_user_data = userData; @@ -21,11 +31,6 @@ void *QWaylandServerBuffer::userData() const return m_user_data; } -QWaylandServerBuffer::Format QWaylandServerBuffer::format() const -{ - return m_format; -} - QWaylandServerBufferIntegration::QWaylandServerBufferIntegration() { } diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h index 7241aec1..79e7cdf2 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -42,6 +42,7 @@ #ifndef QWAYLANDSERVERBUFFERINTEGRATION_H #define QWAYLANDSERVERBUFFERINTEGRATION_H +#include <QtCore/QSize> #include <QtGui/qopengl.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h> @@ -65,13 +66,15 @@ public: //creates new texture for buffer virtual GLuint createTexture() = 0; + Format format() const; + QSize size() const; + void setUserData(void *userData); void *userData() const; - Format format() const; - protected: Format m_format; + QSize m_size; private: void *m_user_data; diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index c4736282..cb54534f 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -75,7 +75,6 @@ public: private: DrmEglServerBufferIntegration *m_integration; EGLImageKHR m_image; - QSize m_size; }; class DrmEglServerBufferIntegration |