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-glx/xcompositeglxintegration.cpp | |
| 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-glx/xcompositeglxintegration.cpp')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp index 421e5df1a..1df6a4c99 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp @@ -71,19 +71,19 @@ QVector<int> qglx_buildSpec() } -XCompositeGLXIntegration::XCompositeGLXIntegration() - : QWaylandGraphicsHardwareIntegration() +XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration() + : QWaylandClientBufferIntegration() , mDisplay(0) , mHandler(0) { } -XCompositeGLXIntegration::~XCompositeGLXIntegration() +XCompositeGLXClientBufferIntegration::~XCompositeGLXClientBufferIntegration() { delete mHandler; } -void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *) +void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display *) { QPlatformNativeInterface *nativeInterface = QGuiApplicationPrivate::platformIntegration()->nativeInterface(); if (nativeInterface) { @@ -112,7 +112,7 @@ void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *) delete glContext; } -GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *) +GLuint XCompositeGLXClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *) { XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window()); @@ -145,12 +145,12 @@ GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *b return textureId; } -bool XCompositeGLXIntegration::isYInverted(struct ::wl_resource *buffer) const +bool XCompositeGLXClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const { return XCompositeBuffer::fromResource(buffer)->isYInverted(); } -QSize XCompositeGLXIntegration::bufferSize(struct ::wl_resource *buffer) const +QSize XCompositeGLXClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const { XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); |