1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a size to the QWaylandServerBuffer on the client side

Browse Source 
Change-Id: I48b7d514c1231eb4bd4a30f1329a89515b497269
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Jorgen Lind 2014-01-03 17:10:21 +01:00 committed by The Qt Project
parent 6e0f6db111
commit d156eae3c5
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp
View File

@ -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) void QWaylandServerBuffer::setUserData(void *userData)
{ {
m_user_data = userData; m_user_data = userData;
@ -21,11 +31,6 @@ void *QWaylandServerBuffer::userData() const
return m_user_data; return m_user_data;
} }
QWaylandServerBuffer::Format QWaylandServerBuffer::format() const
{
return m_format;
}
QWaylandServerBufferIntegration::QWaylandServerBufferIntegration() QWaylandServerBufferIntegration::QWaylandServerBufferIntegration()
{ {
} }

7
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
View File

@ -42,6 +42,7 @@
#ifndef QWAYLANDSERVERBUFFERINTEGRATION_H #ifndef QWAYLANDSERVERBUFFERINTEGRATION_H
#define QWAYLANDSERVERBUFFERINTEGRATION_H #define QWAYLANDSERVERBUFFERINTEGRATION_H
#include <QtCore/QSize>
#include <QtGui/qopengl.h> #include <QtGui/qopengl.h>
#include <QtWaylandClient/private/qwayland-server-buffer-extension.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h>
@ -65,13 +66,15 @@ public:
//creates new texture for buffer //creates new texture for buffer
virtual GLuint createTexture() = 0; virtual GLuint createTexture() = 0;
Format format() const;
QSize size() const;
void setUserData(void *userData); void setUserData(void *userData);
void *userData() const; void *userData() const;
Format format() const;
protected: protected:
Format m_format; Format m_format;
QSize m_size;
private: private:
void *m_user_data; void *m_user_data;