Merge branch 'qt/5.6' into wip-compositor-api

Conflicts:
	examples/wayland/pure-qml/main.cpp
	examples/wayland/pure-qml/qml/Chrome.qml
	examples/wayland/pure-qml/qml/main.qml
	src/client/qwaylanddnd_p.h
	src/compositor/compositor_api/qwaylandquicksurface.cpp
	src/compositor/compositor_api/qwaylandsurface_p.h
	src/compositor/compositor_api/qwaylandsurfaceitem.cpp
	src/compositor/extensions/qwlinputmethodcontext_p.h
	src/compositor/hardware_integration/qwlclientbufferintegration_p.h
	src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h
	src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
	src/compositor/hardware_integration/qwlhwintegration_p.h
	src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h
	src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
	src/compositor/wayland_wrapper/qwlcompositor_p.h
	src/compositor/wayland_wrapper/qwldatadevice_p.h
	src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
	src/compositor/wayland_wrapper/qwldatasource_p.h
	src/compositor/wayland_wrapper/qwlextendedsurface_p.h
	src/compositor/wayland_wrapper/qwlinputdevice_p.h
	src/compositor/wayland_wrapper/qwlinputmethod_p.h
	src/compositor/wayland_wrapper/qwlinputpanel_p.h
	src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h
	src/compositor/wayland_wrapper/qwlkeyboard.cpp
	src/compositor/wayland_wrapper/qwlkeyboard_p.h
	src/compositor/wayland_wrapper/qwloutput_p.h
	src/compositor/wayland_wrapper/qwlpointer_p.h
	src/compositor/wayland_wrapper/qwlregion_p.h
	src/compositor/wayland_wrapper/qwlshellsurface_p.h
	src/compositor/wayland_wrapper/qwlsubsurface_p.h
	src/compositor/wayland_wrapper/qwlsurface.cpp
	src/compositor/wayland_wrapper/qwlsurface_p.h
	src/compositor/wayland_wrapper/qwltextinput_p.h
	src/compositor/wayland_wrapper/qwltextinputmanager_p.h
	src/compositor/wayland_wrapper/qwltouch_p.h
	src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h
	src/imports/compositor/WaylandCursorItem.qml

Change-Id: I4e63ef295b297022d4970b3c68b3d565843086bd

1 files changed, 11 insertions, 6 deletions

diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index 117c5ef80..d0e66362d 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -146,12 +146,6 @@ void WaylandEglClientBufferIntegration::initializeHardware(struct wl_display *di
         return;
     }
 
-    d->gl_egl_image_target_texture_2d = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
-    if (!d->gl_egl_image_target_texture_2d) {
-        qWarning("QtCompositor: Failed to initialize EGL display. Could not find glEGLImageTargetTexture2DOES.");
-        return;
-    }
-
     if (d->egl_bind_wayland_display && d->egl_unbind_wayland_display) {
         d->display_bound = d->egl_bind_wayland_display(d->egl_display, display);
         if (!d->display_bound) {
@@ -170,11 +164,22 @@ void WaylandEglClientBufferIntegration::initializeHardware(struct wl_display *di
 void WaylandEglClientBufferIntegration::bindTextureToBuffer(struct ::wl_resource *buffer)
 {
     Q_D(WaylandEglClientBufferIntegration);
+
     if (!d->valid) {
         qWarning("QtCompositor: bindTextureToBuffer() failed");
         return;
     }
 
+    // Vivante drivers on the iMX6 don't resolve this function early enough for us, they seem to require the EGL/GLES setup to be further
+    // along than they are in initializeHardware(), so do the lookup here instead.
+    if (!d->gl_egl_image_target_texture_2d)
+        d->gl_egl_image_target_texture_2d = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
+
+    if (!d->gl_egl_image_target_texture_2d) {
+        qWarning("QtCompositor: bindTextureToBuffer() failed. Could not find glEGLImageTargetTexture2DOES.");
+        return;
+    }
+
     EGLImageKHR image = d->egl_create_image(d->egl_display, EGL_NO_CONTEXT,
                                           EGL_WAYLAND_BUFFER_WL,
                                           buffer, NULL);