summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-08-25 15:33:17 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-08-26 12:14:06 +0200
commit423b54c8a31cd90aac4b9588d4bd73f5c43f4c80 (patch)
tree8aeff9d515736202a9b17529413b48e2007bc130 /src/compositor
parenta079716f73e539c400579db5bb0ed947edaa80e1 (diff)
Remove the unused context parameter from lock/unlock
Nothing relies on it and we are anyway passing null. Change-Id: I2543650441c7f97d23b52bc7a4caa555b0777676 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegration_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index c9d514078..b660f600c 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
@@ -74,8 +74,8 @@ public:
virtual bool isYInverted(struct ::wl_resource *) const { return true; }
- virtual void *lockNativeBuffer(struct ::wl_resource *, QOpenGLContext *) const { return 0; }
- virtual void unlockNativeBuffer(void *, QOpenGLContext *) const { return; }
+ virtual void *lockNativeBuffer(struct ::wl_resource *) const { return 0; }
+ virtual void unlockNativeBuffer(void *) const { return; }
virtual QSize bufferSize(struct ::wl_resource *) const { return QSize(); }
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
index a1795f488..1ed1fefd8 100644
--- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
@@ -112,7 +112,7 @@ void SurfaceBuffer::destructBufferState()
#ifdef QT_COMPOSITOR_WAYLAND_GL
} else {
ClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration();
- hwIntegration->unlockNativeBuffer(m_handle, 0);
+ hwIntegration->unlockNativeBuffer(m_handle);
#endif
}
}
@@ -216,7 +216,7 @@ void *SurfaceBuffer::handle() const
#ifdef QT_COMPOSITOR_WAYLAND_GL
} else {
ClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration();
- that->m_handle = clientBufferIntegration->lockNativeBuffer(m_buffer, 0);
+ that->m_handle = clientBufferIntegration->lockNativeBuffer(m_buffer);
#endif
}
}