diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-01-06 12:26:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-06 13:12:32 +0100 |
| commit | cd1e9d036ff1354c65b016ba8af0d6d6bd7cea92 (patch) | |
| tree | fc7ff2a2fc5c3f2862b3c0e46589fc44ee1f1a9f /src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | |
| parent | b2bfcec54cb46fa9e6555d3cb77ae6b995392ac6 (diff) | |
Revised createTextureFromBuffer
The context is not passed anymore to texture() and similar functions since
they have to use the current context anyhow.
createTextureFromBuffer() becomes bindTextureToBuffer() which is called
with the texture bound. The integration can also provide its own texture in
case the one created and managed by the surfacebuffer is not suitable.
Change-Id: I1bfc4fe35c0e3db6081b47c551f20f4bca9aa04e
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index be6b02028..5a724eedf 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -61,7 +61,7 @@ public: void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE; - GLuint createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *context) Q_DECL_OVERRIDE; + void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE; bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE; QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE; |