Make example work for the non-streaming case

Don't crash when buffer is shared memory.
Don't set m_texture to 0 when not streaming.
Use the new buffer when advancing.
Use proper filtering when uploading to texture.

Change-Id: I05bb12a05c7448d17d5292910f16b49e613b0ce0
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp
index ecbbc5041..d3e3e1cf0 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();
     }