summaryrefslogtreecommitdiff
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
parenta079716f73e539c400579db5bb0ed947edaa80e1 (diff)
downloadqtwayland-423b54c8a31cd90aac4b9588d4bd73f5c43f4c80.tar.gz
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>
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegration_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp4
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp4
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index c9d51407..b660f600 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 a1795f48..1ed1fefd 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
}
}
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index 5971a3ec..3f7487c4 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -215,7 +215,7 @@ bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer
}
-void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const
+void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *buffer) const
{
Q_D(const WaylandEglClientBufferIntegration);
@@ -225,7 +225,7 @@ void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *
return image;
}
-void WaylandEglClientBufferIntegration::unlockNativeBuffer(void *native_buffer, QOpenGLContext *) const
+void WaylandEglClientBufferIntegration::unlockNativeBuffer(void *native_buffer) const
{
Q_D(const WaylandEglClientBufferIntegration);
EGLImageKHR image = static_cast<EGLImageKHR>(native_buffer);
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index 32291189..c5dd6ad6 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -59,8 +59,8 @@ public:
void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE;
bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE;
- void *lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *context) const Q_DECL_OVERRIDE;
- void unlockNativeBuffer(void *native_buffer, QOpenGLContext *context) const Q_DECL_OVERRIDE;
+ void *lockNativeBuffer(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE;
+ void unlockNativeBuffer(void *native_buffer) const Q_DECL_OVERRIDE;
QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE;