Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: I3279e8339e4fadcc6d5aaafa01e4b15a92168a6c

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp
index 9a65ad3a0..b2470c250 100644
--- a/src/plugins/qnx/common/windowgrabber.cpp
+++ b/src/plugins/qnx/common/windowgrabber.cpp
@@ -393,8 +393,12 @@ GLuint
 WindowGrabberImage::getTexture(screen_window_t window, const QSize &size)
 {
     if (size != m_size) {
-        if (!m_glTexture)
-            glGenTextures(1, &m_glTexture);
+        // create a brand new texture to be the KHR image sibling, as
+        // previously used textures cannot be reused with new KHR image
+        // sources - note that glDeleteTextures handles nullptr gracefully
+        glDeleteTextures(1, &m_glTexture);
+        glGenTextures(1, &m_glTexture);
+
         glBindTexture(GL_TEXTURE_2D, m_glTexture);
         if (m_eglImage) {
             glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, 0);