Merge remote-tracking branch 'qt/5.7.0' into 5.7

Change-Id: I6236699846c922a79a1bd420a161392fd6572001

1 files changed, 7 insertions, 2 deletions

diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp
index d0b3e4c16..1c17b31f7 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp
@@ -68,16 +68,21 @@ WindowCompositorView::WindowCompositorView()
 GLuint WindowCompositorView::getTexture(GLenum *target)
 {
     QWaylandBufferRef buf = currentBuffer();
-    m_texture = buf.textureForPlane(0);
+    GLuint streamingTexture = buf.textureForPlane(0);
+    if (streamingTexture)
+        m_texture = streamingTexture;
 
-    if (buf.bufferFormatEgl() == QWaylandBufferRef::BufferFormatEgl_EXTERNAL_OES)
+    if (!buf.isShm() && buf.bufferFormatEgl() == QWaylandBufferRef::BufferFormatEgl_EXTERNAL_OES)
         m_textureTarget = GL_TEXTURE_EXTERNAL_OES;
 
     if (advance()) {
+        buf = currentBuffer();
         if (!m_texture)
             glGenTextures(1, &m_texture);
 
         glBindTexture(m_textureTarget, m_texture);
+        if (buf.isShm())
+            glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         buf.bindToTexture();
     }