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>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index 55b0cc15e..c645b997f 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -91,7 +91,7 @@ void XCompositeEglClientBufferIntegration::initializeHardware(QtWayland::Display
     new XCompositeHandler(m_compositor->handle(), mDisplay);
 }
 
-GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+void XCompositeEglClientBufferIntegration::bindTextureToBuffer(struct ::wl_resource *buffer)
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
@@ -103,7 +103,7 @@ GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl
     bool matched = eglChooseConfig(mEglDisplay,eglConfigSpec.constData(),&config,1,&matching);
     if (!matched || !matching) {
         qWarning("Could not retrieve a suitable EGL config");
-        return 0;
+        return;
     }
 
     QVector<EGLint> attribList;
@@ -121,17 +121,11 @@ GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl
 
     compositorBuffer->setInvertedY(true);
 
-    GLuint textureId;
-    glGenTextures(1,&textureId);
-    glBindTexture(GL_TEXTURE_2D, textureId);
-
     if (!eglBindTexImage(mEglDisplay,surface,EGL_BACK_BUFFER)) {
         qDebug() << "Failed to bind";
     }
 
     //    eglDestroySurface(mEglDisplay,surface);
-
-    return textureId;
 }
 
 bool XCompositeEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const