diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-13 10:35:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 15:32:36 +0100 |
| commit | 434dcf63a5753c56bcc94185d1af381ae94efeb5 (patch) | |
| tree | 2f5d27bada2026a7cb21dc153d4c8a4d511ffcac /src/hardwareintegration/compositor/xcomposite-egl | |
| parent | eb1c91b2185df1d57a87ed2b5335f3b0ba500c67 (diff) | |
Compositor: rename QWaylandGraphicsHardwareIntegration
to QWaylandClientBufferIntegration. I have checked this with
xcomposite-egl and wayland-egl, abd have tried to do a simple search and
replace for brcm-egl and xcomposite-glx, but there will likely be some
small fixup needed
Change-Id: I48d284b8a5172273e0a26443074a87a8171b9e88
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite-egl')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp | 12 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp index b80858b2c..55b0cc15e 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp @@ -67,14 +67,14 @@ QVector<EGLint> eglbuildSpec() return spec; } -XCompositeEglIntegration::XCompositeEglIntegration() - : QWaylandGraphicsHardwareIntegration() +XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration() + : QWaylandClientBufferIntegration() , mDisplay(0) { } -void XCompositeEglIntegration::initializeHardware(QtWayland::Display *) +void XCompositeEglClientBufferIntegration::initializeHardware(QtWayland::Display *) { QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); if (nativeInterface) { @@ -91,7 +91,7 @@ void XCompositeEglIntegration::initializeHardware(QtWayland::Display *) new XCompositeHandler(m_compositor->handle(), mDisplay); } -GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *) +GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *) { XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window()); @@ -134,13 +134,13 @@ GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *b return textureId; } -bool XCompositeEglIntegration::isYInverted(struct ::wl_resource *buffer) const +bool XCompositeEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const { XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); return compositorBuffer->isYInverted(); } -QSize XCompositeEglIntegration::bufferSize(struct ::wl_resource *buffer) const +QSize XCompositeEglClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const { XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index 562fce140..65a574d1e 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -41,7 +41,7 @@ #ifndef XCOMPOSITEEGLINTEGRATION_H #define XCOMPOSITEEGLINTEGRATION_H -#include <QtCompositor/qwaylandgraphicshardwareintegration.h> +#include <QtCompositor/qwaylandclientbufferintegration.h> #include "xlibinclude.h" @@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE -class XCompositeEglIntegration : public QWaylandGraphicsHardwareIntegration +class XCompositeEglClientBufferIntegration : public QWaylandClientBufferIntegration { public: - XCompositeEglIntegration(); + XCompositeEglClientBufferIntegration(); void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE; |