diff options
Diffstat (limited to 'src/client/hardwareintegration')
-rw-r--r-- | src/client/hardwareintegration/qwaylandserverbufferintegration.cpp | 15 | ||||
-rw-r--r-- | src/client/hardwareintegration/qwaylandserverbufferintegration_p.h | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp index ee64624ad..6e3abe913 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 7241aec1f..79e7cdf2a 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; |